Merge nheko-im/master and fix conflicts

.ci/macos/notarize.sh

.gitlab-ci.yml

CHANGELOG.md

CMakeLists.txt

README.md

appveyor.yml

io.github.NhekoReborn.Nheko.yaml

resources/icons/emoji-categories/activity.png

resources/icons/emoji-categories/activity.svg

resources/icons/emoji-categories/activity@2x.png

resources/icons/emoji-categories/flags.png

resources/icons/emoji-categories/flags.svg

resources/icons/emoji-categories/flags@2x.png

resources/icons/emoji-categories/foods.png

resources/icons/emoji-categories/foods.svg

resources/icons/emoji-categories/foods@2x.png

resources/icons/emoji-categories/nature.png

resources/icons/emoji-categories/nature.svg

resources/icons/emoji-categories/nature@2x.png

resources/icons/emoji-categories/objects.png