Merge "Fix drawColor/drawPaint bounds" into nyc-dev