Merge "Add animation for drag to freeform cancelled" into udc-dev