Merge "Waiting for Launcher to settle after enabling test provider" into sc-v2-dev