Merge "Improving LauncherModel performance"