Merge "Add Night display settings conditional" into nyc-mr1-dev