Merge "Keeping the screen on during gesture detection." into jb-dev