Merge "Add preliminary support for text rendering."