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