Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev