Merge "Explicitly waiting for Launcher to restart after enabling test content provider" into main