Merge "Renaming of LauncherApps apis" into lmp-dev