Merge "Always remove drag view immediately when cancelling drag. (Bug: 6119112)"