Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev