Merge "Fix VectorDrawable dirty flag logic"