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 am: 13fcd174
Change-Id: Ibe1deb92f962db98b8027e6aa701d0d116b21a2a