Merge "Fixing test flakiness in Launcher initialization" into main