Merge "Fix Night Light only display 12-hr time format on secondary label"