Merge "Fix NPE in LauncherAppsService.shouldShowHiddenApp()"