Merge "Only poke the wakelock for FUL if the screen is on fixes 7222901" into jb-mr1-dev