Merge "Workaround for incomplete setup flow prior to Launcher tests" into main