Replace AppSettings with UserSettings from the UserSessionFlow and below.

Remove some redundant injections when passed alongside a user session too.

# Conflicts:
#	ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
#	ElementX/Sources/Screens/Timeline/TimelineViewModel.swift

ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift

@@ -14,7 +14,7 @@ typealias JoinRoomScreenViewModelType = StateStoreViewModel<JoinRoomScreenViewSt
 
 class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewModelProtocol {
     private let source: JoinRoomScreenSource
-    private let appSettings: AppSettings
+    private let userSettings: UserSettings
     private let clientProxy: ClientProxyProtocol
     private let userIndicatorController: UserIndicatorControllerProtocol
     
@@ -30,11 +30,11 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
     }
     
     init(source: JoinRoomScreenSource,
-         appSettings: AppSettings,
+         userSettings: UserSettings,
          userSession: UserSessionProtocol,
          userIndicatorController: UserIndicatorControllerProtocol) {
         self.source = source
-        self.appSettings = appSettings
+        self.userSettings = userSettings
         clientProxy = userSession.clientProxy
         self.userIndicatorController = userIndicatorController
         
@@ -52,7 +52,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
             .sink { mode in
                 switch mode {
                 case .invited:
-                    appSettings.seenInvites.insert(roomID)
+                    userSettings.seenInvites.insert(roomID)
                 default:
                     break
                 }
@@ -350,7 +350,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
         guard !hasSentJoinAction else { return }
         
         let roomID = state.roomID
-        appSettings.seenInvites.remove(roomID)
+        userSettings.seenInvites.remove(roomID)
         
         guard state.roomDetails?.isSpace == true else {
             hasSentJoinAction = true
@@ -464,7 +464,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
             return false
         }
         
-        appSettings.seenInvites.remove(roomID)
+        userSettings.seenInvites.remove(roomID)
         
         actionsSubject.send(.dismiss)
         return true