Merge "Ensure that we update the next dark intensity when restoring the state"...
Merge "Ensure that we update the next dark intensity when restoring the state" into rvc-dev am: c6025a7f am: b839c6c6 am: c862c8b1 am: 995b72d5
Change-Id: I7ff99fda6e012b45f62bb2f4b24d9a2f291c963c