Merge "Cancel pending animation when state changed." into udc-dev