Merge "Add some missing Settings and DayNight themes" into mnc-dev