Merge "Add night display pref controllers and change UX" into pi-dev