Merge "Use a one-off thread to load launch params" into main