Merge branch 'fix/emoji-picker' into 'develop'