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

Change-Id: I83536aa49173091ed5fe8ad96e8f752a5313ef93