Merge "Prevent NPE in ProximitySensor." into rvc-d1-dev