Merge "Don't activate Night display until user setup is complete" into nyc-mr1-dev