Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am: 126366dde5

Change-Id: Iba8b3696738f9fc0260311d49d6e98dfcedbc118