Merge "Synchronize NightDisplayListener"