Merge "Fix TintContextWrapper not always handling vector assets"