Merge "pass font instead of paint to blobbuilder"