am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev

* commit 'd6e3ad54907ec085aa41e5c77296e9f385c22e67':
  Reduce screen on/off latency.