Merge master and fix conflicts

.ci/macos/Brewfile

.gitlab-ci.yml

CMakeLists.txt

README.md

io.github.NhekoReborn.Nheko.json

resources/nheko.desktop

resources/qml/MessageInput.qml

resources/qml/MessageView.qml

resources/qml/TimelineView.qml

resources/qml/ui/Ripple.qml

resources/qml/voip/ActiveCallBar.qml

resources/qml/voip/CallDevices.qml

resources/qml/voip/CallInviteBar.qml

resources/qml/voip/DeviceError.qml

resources/qml/voip/PlaceCall.qml

resources/qml/voip/VideoCall.qml

resources/res.qrc

src/Cache.cpp

src/Cache_p.h

src/CallManager.cpp