Merge "Fix AnimatorListeners.forEndCallback()" into sc-dev