Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev