Merge "Simplifying some LauncherModel logic" into main