Merge origin/master and fix conflicts

c91e771d · Joe Donofry · a4754e79 · b73bd285 · c91e771d · c91e771d
Verified Commit c91e771d authored 3 years ago by Joe Donofry
--- a/resources/qml/ReadReceipts.qml
+++ b/resources/qml/ReadReceipts.qml
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
--- a/resources/qml/RoomMembers.qml
+++ b/resources/qml/RoomMembers.qml
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
--- a/resources/qml/components/AvatarListTile.qml
+++ b/resources/qml/components/AvatarListTile.qml
--- a/resources/qml/delegates/Encrypted.qml
+++ b/resources/qml/delegates/Encrypted.qml
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
--- a/resources/qml/dialogs/ImagePackEditorDialog.qml
+++ b/resources/qml/dialogs/ImagePackEditorDialog.qml
--- a/resources/qml/dialogs/ImagePackSettingsDialog.qml
+++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml
--- a/resources/qml/dialogs/InputDialog.qml
+++ b/resources/qml/dialogs/InputDialog.qml