Merge "Handle unbounded drawPaint/drawGLFunction operations safely" into nyc-dev