am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev
automerge: 358aed4

* commit '358aed4587c3c278bff61b90291d4e69ab6b5b04':
  Improve doze transitions