Merge "Move AnimatedImageDrawable off of NewWeakGlobalRef"