Merge "Add AnimatedVectorDrawable support for VideoPreference"