Merge "More fixes for VectorDrawable memory management"