Merge "Enable testQuickSwitchFromApp after fixing what caused it to fail" into ub-launcher3-master