Merge "Add support for non-antialiased text"