Merge "Hypothetically fix test flake" into main