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

* commit '8d48e401b8dc909636de129f860fa083d1755612':
  Reduce screen on/off latency.