Merge "Color theming for VectorDrawable, general clean up"