Merge "Fixing testQuickSwitchToPreviousAppForTablet" into main