Merge "Revert^2 "Wait for LauncherModel loaded in waitForLauncherInitialized"" into main