Merge "Add legacy mode assertions for the scene container flag" into main