Merge "Handle Emoji clustering for cursor handling" into devel/master