Merge "[bc25] Remove the deprecated shade scenes from SceneContainer." into main