Merge origin/master and fix conflicts

resources/qml/emoji/StickerPicker.qml

resources/qml/voip/CallInvite.qml

resources/qml/voip/PlaceCall.qml

resources/qml/voip/ScreenShare.qml

resources/res.qrc

src/Cache.cpp

src/CacheCryptoStructs.h

src/CacheStructs.h

src/Cache_p.h

src/ChatPage.cpp

src/CombinedImagePackModel.cpp

src/CombinedImagePackModel.h

src/ImagePackListModel.cpp

src/ImagePackListModel.h

src/InviteeItem.cpp

src/InviteeItem.h

src/InviteesModel.cpp

src/InviteesModel.h

src/Logging.cpp

src/MainWindow.cpp