Merge "Make AnimatedImageDrawable.start reset"