Merge "Merge "Handling the touch better when the screen turns off" into oc-dev am: bd54d2c2bd am: 9bf8edfc49  -s ours"