Merge "Make QS work in SceneContainer when locked" into main