Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 am: 4035b79b1d am: 3f563648be

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/12689936

Change-Id: I171f7eb40ebe8057f815e36503daae0bc2a0330f
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 86845fc..786bebd 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -124,6 +124,8 @@
             return;
         }
 
+        mDelegate.getCategoryProvider().resetIfNeeded();
+
         setContentView(R.layout.activity_customization_picker_main);
         setUpBottomNavView();
         mBottomActionBar = findViewById(R.id.bottom_actionbar);