Merge "Don't store a pointer to internal SensorManager"