Merge "Make sure we don't accidentally allow the night mode tile" into nyc-dev