Merge "Remove On/Off string from Night light slice" into qt-dev