Merge "Fix dirtyMask in AnimateFunctor" into nyc-dev