Merge "Fix start/pause behavior for AnimatedImageDrawable"