Merge "move to new virtual for drawVertices"