Merge "Ensure that we update the next dark intensity when restoring the state" into rvc-dev