Use NSAttributedString to draw complex chars unless they contain combining marks. This should improve performance.
Fix merge conflicts