Merge "Update the BorderAnimator" into udc-dev