Merge Master into Dev after showLoginPage Cherry-Pick (#2829)

* @W-20935841: Bug - P2 - [Android] Login Server Switching Misbehaving (#2822)

* Fix showLoginPage on token revoke.

* @W-20992906: [Android] Remove welcome from default server list in master (#2825)

---------

Co-authored-by: Eric C. Johnson <Johnson.Eric@Salesforce.com>

Author: brandonpage

libs/SalesforceSDK/res/xml/servers.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <servers>
     <server name="Production" url="https://login.salesforce.com" />
-    <server name="Welcome" url="https://welcome.salesforce.com/discovery" />
     <server name="Sandbox" url="https://test.salesforce.com" />
 </servers>

native/NativeSampleApps/RestExplorer/res/xml/servers.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <servers>
     <server name="Production" url="https://login.salesforce.com" />
-    <server name="Welcome" url="https://welcome.salesforce.com/discovery" />
     <server name="Sandbox" url="https://test.salesforce.com" />
     <server name="SDK Production" url="https://mobilesdk.my.salesforce.com" />
 </servers>