Merge "Add add/remove for AnimationListener's"