Merge "Night display status restored until valid state" into oc-dev
am: 2710490ac9

Change-Id: Ie1bcdaff64110ea0e3a6ec3ea14e1637c5390008