Merge "Night display status restored until valid state" into oc-dev