Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev