Merge pull request #9676 from MrPetovan/bug/9639-limit-ap-emoji-size