Merge change 23345 into donut

* changes:
  Fix an emoji-measuring bug that caused an exception when editing a contact.