Merge "Fix deadlock on SensorService" into rvc-dev