Merge "Fix AnimationDrawable double-start bug"