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