Merge "Fix View_AnimationTest"