Merge "Fix b/265409044: The battery usage page auto goes up when coming back from app details page."

src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java

@@ -217,13 +217,16 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     }
 
     private void showSpinnerAndAppList() {
-        removeAndCacheAllPreferences();
         if (mBatteryDiffData == null) {
+            mHandler.post(() -> {
+                removeAndCacheAllPreferences();
+            });
             return;
         }
         mSpinnerPreference.setVisible(true);
         mAppListPreferenceGroup.setVisible(true);
         mHandler.post(() -> {
+            removeAndCacheAllPreferences();
             addAllPreferences();
         });
     }