Merge "Refactor the BorderAnimator for simplicity" into main