Merge "Remove night mode from developer settings" into nyc-dev