Merge "Remove scene container code from MediaControlPanel" into main