Merge "Remove usage of deprecated DayNightStyle values." into pi-dev