Merge branch 'bugfix/emoji-size' into 'develop'