Merge "[QS] Update night light time from 24 to 12-hr"