Merge "Fix a concurrent modification in ProximityCheck" into main