Merge "[bc25] Ensure SceneContainer remains visible on Gone when shade is open." into main