Merge "More defensive checks for ProximitySensor" into rvc-d1-dev