Merge "Show SceneContainer when a HUN is active" into main