Merge "Fix an issue where sometimes we wouldn't animate while dismissing" into udc-dev