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