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: c9e61a0f am: 77957672 am: 3f17c5f3
Change-Id: I62b05c16159cfb355a4ab42b38038773785f94b1