Merge "Add color temperature preference to Night Display"