Merge "Further syncing Launcher3 atest XML config with the GCL one" into main