Merge "Fix a possible SensorService deadlock." into lmp-dev