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: Ie70faf05a3e82eda1f3b7f99ea163f864b7d5c4a