Merge "Fix potential deadlock with SensorObserver." into sc-v2-dev