Merge "Demoting testQuickSwitchToPreviousAppForTablet from presubmit" into udc-qpr-dev