Merge "Handling the touch better when the screen turns off" into oc-dev