Merge "Disable ShortcutsLaunchTest.testAppLauncher*" into ub-launcher3-master