Merge "Internal cleanup for Animator framework"