Merge change 23357 into eclair

* changes:
  Fix double-free problem in EmojiFactory.