Merge "Prefer animation in ImageDecoder.decodeDrawable"