Merge "Relaunch the activity with current configuration to avoid flakiness" into main