Merge "SensorManager doesn't need to ping the remote service" into main