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
Change-Id: I6742d22d0ba2b4ffcbf43013555460b781ae8616