Merge "Add color temperature preference for Night Display"