Merge "Fix LauncherAppsService queryIntentLauncherActivities"