Merge origin/master and fix conflicts

src/dialogs/MemberList.h

src/dialogs/RawMessage.h

src/dialogs/ReadReceipts.cpp

src/dialogs/ReadReceipts.h

src/notifications/ManagerLinux.cpp

src/timeline/EventStore.cpp

src/timeline/EventStore.h

src/timeline/InputBar.cpp

src/timeline/InputBar.h

src/timeline/Permissions.cpp

src/timeline/Permissions.h

src/timeline/RoomlistModel.cpp

src/timeline/TimelineModel.cpp

src/timeline/TimelineModel.h

src/timeline/TimelineViewManager.cpp

src/timeline/TimelineViewManager.h

src/ui/Avatar.cpp

src/ui/Avatar.h

src/ui/InfoMessage.cpp

src/ui/NhekoGlobalObject.cpp