Merge "Revert "Handle uiMode changes in QuickstepLauncher"" into main