Merge changes I084f06be,I11b3cb18 into main

* changes:
  Enable smoother burn-in adjustments on transition cancel
  Add reasons from DOZING->GONE