Merge "Fix night mode availability" into nyc-dev