Merge "Handle night display state when timezone changes" into oc-mr1-dev