Merge branch 'emoji-in-account-view' into 'develop'