Merge "End animation when deleting." into udc-dev