Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev