Merge "Remove usage of DayNightStyle attribute."