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