diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
index 88bdee4c1..4b8cf724b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
@@ -67,9 +67,9 @@ public class DBAlert extends XWDialogFragment {
     @Override
     public void onSaveInstanceState( Bundle bundle )
     {
-        super.onSaveInstanceState( bundle );
         bundle.putInt( DLG_ID_KEY, mDlgID.ordinal() );
         bundle.putSerializable( PARMS_KEY, mParams );
+        super.onSaveInstanceState( bundle );
     }
     
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
index db3628cc6..2c19b8904 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
@@ -65,8 +65,8 @@ abstract class DlgDelegateAlert extends XWDialogFragment {
     @Override
     public void onSaveInstanceState( Bundle bundle )
     {
-        super.onSaveInstanceState( bundle );
         bundle.putParcelable( STATE_KEY, m_state );
+        super.onSaveInstanceState( bundle );
     }
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 00267c46a..e00427476 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1041,7 +1041,6 @@ public class GamesListDelegate extends ListDelegateBase
     @Override
     protected void onSaveInstanceState( Bundle outState )
     {
-        // super.onSaveInstanceState( outState );
         outState.putBoolean( SAVE_NEXTSOLO, m_nextIsSolo );
         outState.putSerializable( SAVE_SELGAMES, (HashSet)m_selGames );
         outState.putSerializable( SAVE_SELGROUPS, (HashSet)m_selGroupIDs );
@@ -1051,6 +1050,7 @@ public class GamesListDelegate extends ListDelegateBase
         if ( null != m_rematchExtras ) {
             outState.putBundle( SAVE_REMATCHEXTRAS, m_rematchExtras );
         }
+        super.onSaveInstanceState( outState );
     }
 
     private void getBundledData( Bundle bundle )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
index 8f6083a25..abc0a5efc 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
@@ -46,8 +46,8 @@ public class LookupAlert extends XWDialogFragment {
     @Override
     public void onSaveInstanceState( Bundle bundle )
     {
-        super.onSaveInstanceState( bundle );
         m_view.saveInstanceState( bundle );
+        super.onSaveInstanceState( bundle );
     }
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index 89211dd72..566cd3c1a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -88,8 +88,8 @@ public class MainActivity extends XWActivity
     @Override
     protected void onSaveInstanceState( Bundle outState )
     {
-        super.onSaveInstanceState( outState );
         m_safeToCommit = false;
+        super.onSaveInstanceState( outState );
     }
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
index 8d24ba691..272e96845 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
@@ -88,10 +88,10 @@ public class TilePickAlert extends XWDialogFragment
     @Override
     public void onSaveInstanceState( Bundle bundle )
     {
-        super.onSaveInstanceState( bundle );
         bundle.putSerializable( TPS, m_state );
         bundle.putSerializable( ACTION, m_action );
         m_view.saveInstanceState( bundle );
+        super.onSaveInstanceState( bundle );
     }
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
index 7fcee4419..81b07f496 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
@@ -66,8 +66,11 @@ public class XWActivity extends FragmentActivity
     @Override
     protected void onSaveInstanceState( Bundle outState )
     {
-        super.onSaveInstanceState( outState );
+        if ( XWApp.LOG_LIFECYLE ) {
+            DbgUtils.logi( TAG, "onSaveInstanceState(this=%H)", this );
+        }
         m_dlgt.onSaveInstanceState( outState );
+        super.onSaveInstanceState( outState );
     }
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
index 3a0bfbcfc..7c6e76beb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
@@ -85,10 +85,10 @@ abstract class XWFragment extends Fragment implements Delegator {
     public void onSaveInstanceState( Bundle outState )
     {
         DbgUtils.logd( TAG, "%s.onCreate() called", getClass().getSimpleName() );
-        super.onSaveInstanceState( outState );
         Assert.assertNotNull( m_parentName );
         outState.putString( PARENT_NAME, m_parentName );
         m_dlgt.onSaveInstanceState( outState );
+        super.onSaveInstanceState( outState );
     }
 
     protected void onCreate( DelegateBase dlgt, Bundle sis )