diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 01551da34ef..66e8c5459f4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -191,8 +191,10 @@ public class WifiSettings extends RestrictedSettingsFragment
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        getPreferenceManager().setPreferenceComparisonCallback(
-                new PreferenceManager.SimplePreferenceComparisonCallback());
+        // TODO(b/37429702): Add animations and preference comparator back after initial screen is
+        // loaded (ODR).
+        setAnimationAllowed(false);
+
         addPreferencesFromResource(R.xml.wifi_settings);
 
         mConnectedAccessPointPreferenceCategory =
@@ -204,9 +206,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
         mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
 
-        // Hide additional settings until access points are shown during onStart
-        showAdditionalSettings(false);
-
         Context prefContext = getPrefContext();
         mAddPreference = new Preference(prefContext);
         mAddPreference.setIcon(R.drawable.ic_menu_add_inset);
@@ -224,17 +223,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         mBgThread.start();
     }
 
-    // TODO(b/37429702): Figure out how to temporarily disable animations during startup and remove
-    // this method.
-    private void showAdditionalSettings(boolean visible) {
-        mAdditionalSettingsPreferenceCategory.setVisible(visible);
-        mAdditionalSettingsPreferenceCategory.removeAll();
-        if (visible) {
-            mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
-            mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference);
-        }
-    }
-
     @Override
     public void onDestroy() {
         mBgThread.quit();
@@ -359,8 +347,6 @@ public class WifiSettings extends RestrictedSettingsFragment
             getView().removeCallbacks(mUpdateAccessPointsRunnable);
             updateAccessPointPreferences();
         }
-
-        showAdditionalSettings(true);
     }
 
     /**
@@ -394,7 +380,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         mWifiTracker.stopTracking();
         getView().removeCallbacks(mUpdateAccessPointsRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
-        showAdditionalSettings(false);
         super.onStop();
     }