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 am: c862c8b1
Change-Id: I09983cd067efa1fcc2df1eb579365856707f523b