Merge "Avoid mutating requests HashSet from different threads." into 24D1-dev