Merge "Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE" into nyc-dev