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

Change-Id: Id015cd13042de40521b2d5b951ce39cab53d5e49