Merge "Rename NightDisplayController and -Service"