Merge "Add SETTINGS_CONDITION_NIGHT_DISPLAY" into nyc-mr1-dev