Merge "Fix SUW unstash animation." into udc-dev