Merge "Use HTML text preference for rich content"