Merge "Cleaning up LauncherModel"