Merge "State based animators for Views"