Merge "Fix memory leak with RenderNodeAnimator" into tm-dev