Merge "Night display status restores on reboot/user change" into oc-dev
am: 78e03b44c3

Change-Id: I4cd13b8858f731ad66c5d0697cb95993317890ca