Merge "Fix for an IOOBoundsException in Paint." into honeycomb