Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev