Merge "Refactor dynamic sensor callback in SensorDevice"