Merge "Cleaning up VectorDrawable"