Merge "Fixing local atest runs of Launcher tests" into main