Merge "Create aconfig flag for media in scene container" into main