Merge help and feedback into one menu item

MyTracks/res/menu/track_detail.xml

@@ -86,13 +86,8 @@ limitations under the License.
     android:orderInCategory="14"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/ic_menu_feedback"
-    android:id="@+id/track_detail_feedback"
+    android:icon="@drawable/ic_menu_help_feedback"
+    android:id="@+id/track_detail_help_feedback"
     android:orderInCategory="15"
-    android:title="@string/menu_feedback"/>
-  <item
-    android:icon="@drawable/ic_menu_help"
-    android:id="@+id/track_detail_help"
-    android:orderInCategory="16"
-    android:title="@string/menu_help"/>
+    android:title="@string/menu_help_feedback"/>
 </menu>

MyTracks/res/menu/track_list.xml

@@ -55,11 +55,7 @@ limitations under the License.
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/ic_menu_feedback"
-    android:id="@+id/track_list_feedback"
-    android:title="@string/menu_feedback"/>
-  <item
-    android:icon="@drawable/ic_menu_help"
-    android:id="@+id/track_list_help"
-    android:title="@string/menu_help"/>
+    android:icon="@drawable/ic_menu_help_feedback"
+    android:id="@+id/track_list_help_feedback"
+    android:title="@string/menu_help_feedback"/>
 </menu>

MyTracks/res/values/strings.xml

@@ -1137,18 +1137,18 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Export all
   </string>
-  <string name="menu_feedback"
-    translation_description="In the menu, to enter feedback.
-
-      Character limit: ~20 (1 line)">
-    Feedback
-  </string>
   <string name="menu_help"
     translation_description="In the menu, to go to the help page.
 
       Character limit: ~20 (1 line)">
     Help
   </string>
+  <string name="menu_help_feedback"
+    translation_description="In the menu, to go to the help and feedback page.
+
+      Character limit: ~20 (1 line)">
+    Help &amp; feedback
+  </string>
   <string name="menu_import_all"
     translation_description="In the menu, to import all the tracks from the external storage.