Merge "Revert addition of add/removeAnimationListener"