am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
automerge: 9d2a478

* commit '9d2a47857899845d2e00f4a968a0916deeb1fb2e':
  Don't animate screen brightness if there is a pending off transition