Merge \\"Add SETTINGS_CONDITION_NIGHT_DISPLAY\\" into nyc-mr1-dev am: 1e6e1ffeaa
am: 7b330a1f2b

Change-Id: I46bebb5f6b267df5bcd69a03a98b24a61a6a41a7