Merge "Fix MediaCarousel position in QS" into main