Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev am: 02862f31f8
am: 0bf5c1227b

Change-Id: I23ef52a0b4ad54cf195dcd65547911dcca70a2e0