Merge "Fix VectorDrawable size rounding issue" into oc-dev