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