Merge "Rename TextAttributeBuilder"