Restore the conversation list position

Bug: 6268694
Change-Id: I430e688b07eed6e4c4087dca5de7ae238e1bbcb8
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 0d03431..c7e1a8b 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -228,6 +228,14 @@
         // force setting the mode manually this time around.
         onViewModeChanged(mActivity.getViewMode().getMode());
 
+        // Restore the list state
+        if (mListSavedState != null) {
+            mListView.onRestoreInstanceState(mListSavedState);
+
+            // TODO: find a better way to unset the selected item when restoring
+            mListView.clearChoices();
+        }
+
         if (mActivity.isFinishing()) {
             // Activity is finishing, just bail.
             return;