Merge "Night Mode Sensor Service"