Merge "Don't modify -1 sensorHandle value" into rvc-dev