Merge "Fix NC caused by race condition in SystemSensorManager" into nyc-dev