Merge "Stabilize flaky tests by adding packet delay" into main