Merge "Animated fullscreen and desktop carousel attaching together" into main