Merge "Fix AnimatedImageDrawable drawn in software"