Merge "Reduce flakiness" into main