Merge "Make Night display off by default" into nyc-mr1-dev