am 60ffc8a9: am 93aa70c6: Merge "Only poke the wakelock for FUL if the screen is on fixes 7222901" into jb-mr1-dev

* commit '60ffc8a974cde6aea08c93fac27b2ae78fef1bb4':
  Only poke the wakelock for FUL if the screen is on fixes 7222901