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

Change-Id: Ic52dca65fb9e809d22ff8e7bccb45f3a05295445