Merge "Fix a timing issue where LauncherApps registers its callback twice"