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

Change-Id: I1af9411b0338112c41112b54aee14f42412536f2