Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev