Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev