Merge "Cleanup vertex attrib management" into nyc-dev