Merge "Delete SceneContainerFlags" into main