Merge "Touch cancellation handling"