Merge branch 'master' of https://github.com/commons-app/apps-android-commons

Author: misaochan

app/src/main/AndroidManifest.xml

@@ -48,7 +48,8 @@
 
         <activity android:name=".upload.UploadActivity"
             android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:configChanges="orientation|screenSize|keyboard">
             <intent-filter android:label="@string/intent_share_upload_label">
                 <action android:name="android.intent.action.SEND" />
 
@@ -106,6 +107,7 @@
         <activity
             android:name=".explore.SearchActivity"
             android:label="@string/title_activity_search"
+            android:launchMode="singleTop"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:parentActivityName=".contributions.MainActivity"
             />

app/src/main/res/values/strings.xml

@@ -383,7 +383,7 @@
   <string name="contributions_fragment">Contributions</string>
   <string name="nearby_fragment">Nearby</string>
   <string name="notifications">Notifications</string>
-  <string name="archived_notifications">Notifications(archived)</string>
+  <string name="archived_notifications">Notifications (archived)</string>
   <string name="display_nearby_notification">Display nearby notification</string>
   <string name="display_nearby_notification_summary">Tap here to see the nearest place that needs pictures</string>
   <string name="no_close_nearby">No nearby places found close to you</string>