Merge "Wait for launcher state before proceeding next test step" into main