Misc settings UX fixes.

Bug: 5068602
Change-Id: I02acf3690e98ce747ddb4d3a745ac2fa59948c70
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 28a6ea7..c6143ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -157,7 +157,8 @@
         </activity>
         <activity
             android:name=".activity.setup.AccountSettings"
-            android:label="@string/account_settings_action"
+            android:label="@string/settings_activity_title"
+            android:theme="@android:style/Theme.Holo.Light"
             >
             <intent-filter>
                 <action