Merge \"Don\'t activate Night display until user setup is complete\" into nyc-mr1-dev
am: 6028472b8a

Change-Id: I2dbc30f9b7744df53e17276f438db0c65a24a341