am 280e9c2b: am 49d5ca18: Merge "Updated calls for LauncherApps renaming." into ub-now-porkchop

* commit '280e9c2b1b6a3ae98817d868002f4220d2e96a76':