Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev