am 56205fea: Merge change 23345 into donut

Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.