Merge "Fix bug where unstash animation plays twice." into udc-dev