Merge "Fix potential deadlock with SensorObserver."