Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop