Merge "Use correct PowerManager call to wake up screen" into jb-mr1-dev