Merge "Fix flakes due to networks obtained via sync APIs" into main