Merge "Fix GWPC test flakiness." into main