Merge "Revert "Separate desktop and fullscreen carousel"" into main