Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev