Merge "Fix the test flake in testChangeUnderlyingNetworks" into main