Merge "Ensure that we update the next dark intensity when restoring the state" into rvc-dev am: c6025a7fbd am: c9e61a0f49
Change-Id: I86c9bac79f518b8496ef779a71f84dfce8cd2ced
This commit is contained in: