Merge "Set AnimationDrawable running to false unless animation is scheduled"