am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

* commit '24aecc3fb609ce999a7fef7a610891d5a32eb92c':
  Handle surrogate pairs in Html.toHtml()