Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC.swift
# Session/Meta/AppDelegate.swift
# SessionMessagingKit/Database/Models/Interaction.swift
# SessionMessagingKit/Database/Models/SessionThread.swift
# SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
# SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
# SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
# SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
# SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift
# SessionNotificationServiceExtension/NotificationServiceExtension.swift
# SessionUtilitiesKit/Database/Storage.swift
# SessionUtilitiesKit/Utilities/Bencode.swift
# SignalUtilitiesKit/Utilities/AppSetup.swift
|