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