Merge "Waiting for Launcher to stop after quick-starting test apps" into main