Merge "[QS] Change secondary label for night light"