Keep honouring selected screen access role after swapping to layout tab

packages/builder/src/builderStore/store/frontend.js

@@ -89,11 +89,6 @@ export const getFrontendStore = () => {
           let screen =
             screens.find(screen => screen._id === screenId) || screens[0]
           if (!screen) return state
-
-          // Update role to the screen's role setting so that it will always
-          // be visible
-          selectedAccessRole.set(screen.routing.roleId)
-
           state.currentFrontEndType = FrontendTypes.SCREEN
           state.currentAssetId = screen._id
           state.currentView = "detail"
@@ -107,6 +102,7 @@ export const getFrontendStore = () => {
           state.currentAssetId = screen._id
           state.selectedComponentId = screen.props._id
           state.currentFrontEndType = FrontendTypes.SCREEN
+          selectedAccessRole.set(screen.routing.roleId)
           return state
         })
         return screen