Merge "Fix Media Carousel gone <-> splitshade transition" into main