Merge "Revert "Implement View.cancelDrag""