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: 5e0eeec9 am: ac47eda2
Change-Id: If544c4d2bb6b4fee209470cd6618f5aed64ae348