Merge "Handle night display state when timezone changes" into oc-mr1-dev am: 1276f357d3
am: 1cdb151ef7

Change-Id: Ibb9931592abf7c8c8743fd52872ae6fed785a992