Merge "Fix infinite loop problem in AnimationHandler" into oc-dev