Merge "Sensor: Make switching from data injection mode to normal mode more productive"