Merge "Update BorderAnimator to work with layout updates" into udc-dev