Make AccountSettingsXL the main settings UI

* Connect to it from all call sites
* Remove 1-pane and 2-pane icons
* Leave a few more breadcrumbs for launching into specific account
* Update the long TODO list in AccountSettingsXL

Change-Id: I502eda9a622518e8d4a23d46989340ad400cdd34
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 809cede..77434c4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -416,29 +416,5 @@
         </provider>
         <!--EXCHANGE-REMOVE-SECTION-END-->
 
-        <!--
-            STOPSHIP: These aliases are only for development.  Remove them.
-        -->
-        <activity-alias
-            android:name="dev_one_pane"
-            android:label="@string/activity_label_1pane"
-            android:targetActivity=".activity.AccountFolderList"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity-alias>
-        <activity-alias
-            android:name="dev_two_pane"
-            android:label="@string/activity_label_2pane"
-            android:targetActivity=".activity.MessageListXL"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity-alias>
-
     </application>
 </manifest>