#554 - minimal changes to allow setting a custom AnimatorListener