Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev