am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev

* commit 'd09f0b6b2c599ea05172c20404a2009dec61a7e9':
  Doze: Wake up on touch, fade between states.