Partial merge of develop to experimental

Does not include #2336 as the file has been moved out from underneath it:
will do this separately

src/Lifecycle.js

@@ -32,6 +32,7 @@ import Modal from './Modal';
 import sdk from './index';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
 import PlatformPeg from "./PlatformPeg";
+import {sendLoginRequest} from "./Login";
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -129,27 +130,17 @@ export function attemptTokenLogin(queryParams, defaultDeviceDisplayName) {
         return Promise.resolve(false);
     }
 
-    // create a temporary MatrixClient to do the login
-    const client = Matrix.createClient({
-        baseUrl: queryParams.homeserver,
-    });
-
-    return client.login(
+    return sendLoginRequest(
+        queryParams.homeserver,
+        queryParams.identityServer,
         "m.login.token", {
             token: queryParams.loginToken,
             initial_device_display_name: defaultDeviceDisplayName,
         },
-    ).then(function(data) {
+    ).then(function(creds) {
         console.log("Logged in with token");
         return _clearStorage().then(() => {
-            _persistCredentialsToLocalStorage({
-                userId: data.user_id,
-                deviceId: data.device_id,
-                accessToken: data.access_token,
-                homeserverUrl: queryParams.homeserver,
-                identityServerUrl: queryParams.identityServer,
-                guest: false,
-            });
+            _persistCredentialsToLocalStorage(creds);
             return true;
         });
     }).catch((err) => {
@@ -506,16 +497,7 @@ function _clearStorage() {
     Analytics.logout();
 
     if (window.localStorage) {
-        const hsUrl = window.localStorage.getItem("mx_hs_url");
-        const isUrl = window.localStorage.getItem("mx_is_url");
         window.localStorage.clear();
-
-        // preserve our HS & IS URLs for convenience
-        // N.B. we cache them in hsUrl/isUrl and can't really inline them
-        // as getCurrentHsUrl() may call through to localStorage.
-        // NB. We do clear the device ID (as well as all the settings)
-        if (hsUrl) window.localStorage.setItem("mx_hs_url", hsUrl);
-        if (isUrl) window.localStorage.setItem("mx_is_url", isUrl);
     }
 
     // create a temporary client to clear out the persistent stores.