Merge "Revert "Move testQuickSwitchFromHome to possubmit"" into main