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