Merge "Correct the pair-to-pair transition animation" into udc-dev