Misc style fixes.

- split action bar should not happen on compose and settings

Bug: 5127008
Change-Id: I97f2ccac26522831db69216b69a858e382571f5e

AndroidManifest.xml

@@ -91,7 +91,6 @@
         android:label="@string/app_name"
         android:name="Email"
         android:theme="@style/EmailTheme"
-        android:uiOptions="splitActionBarWhenNarrow"
         android:hardwareAccelerated="false"
         >
         <activity
@@ -205,7 +204,9 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.EmailActivity">
+            android:name=".activity.EmailActivity"
+            android:uiOptions="splitActionBarWhenNarrow"
+            >
         </activity>
         <activity
             android:name=".activity.MessageFileView"
@@ -264,6 +265,7 @@
             </intent-filter>
         </activity>
 
+        <!-- Only used to support pre-HC shortcuts -->
         <activity
             android:name=".activity.MessageList"
             >