Don't bury sort menu in overflow in Migrate screen

app/src/main/res/menu/browse_migrate.xml

@@ -1,16 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_source_migration_help"
-        android:icon="@drawable/ic_help_24dp"
-        android:title="@string/migration_help_guide"
-        app:iconTint="?attr/colorOnToolbar"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_sort"
+        android:icon="@drawable/ic_sort_24dp"
         android:title="@string/action_sort"
-        app:showAsAction="never">
+        app:iconTint="?attr/colorOnToolbar"
+        app:showAsAction="collapseActionView|ifRoom" >
         <menu>
             <item
                 android:id="@+id/action_sort_alphabetical"
@@ -41,4 +37,11 @@
         </menu>
     </item>
 
+    <item
+        android:id="@+id/action_source_migration_help"
+        android:icon="@drawable/ic_help_24dp"
+        android:title="@string/migration_help_guide"
+        app:iconTint="?attr/colorOnToolbar"
+        app:showAsAction="ifRoom" />
+
 </menu>