Merge "Fixes for AnimationDrawable"