Merge "Fix night display activation behavior after reboot" into oc-dev