Merge "Disable testQuickSwitchFromApp test due to test failures" into ub-launcher3-master