Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev