Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev