Merge "Don't immediately show keyboard in edit screen"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2697fb..f145ac1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -333,7 +333,7 @@
         <activity
             android:name=".activities.ContactEditorActivity"
             android:theme="@style/EditorActivityTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="stateHidden|adjustResize">
 
             <intent-filter android:label="@string/editContactDescription">
                 <action android:name="android.intent.action.EDIT" />