Merge "Disable failing test testQuickSwitchFromApp" into ub-launcher3-master