Merge "Revert "Increasing wait time for Launcher restart after enabling test provider"" into main