Merge "Fix test flakiness." into main