Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev