diff --git a/src/com/android/launcher3/logging/StatsLogManager.kt b/src/com/android/launcher3/logging/StatsLogManager.kt
index 61e947ebcc..fd0ef49408 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.kt
+++ b/src/com/android/launcher3/logging/StatsLogManager.kt
@@ -623,6 +623,8 @@ open class StatsLogManager protected constructor(@JvmField protected val mContex
         LAUNCHER_DESKTOP_MODE_TASKBAR_PINNED(2241),
         @UiEvent(doc = "User has unpinned taskbar in desktop mode using taskbar divider menu")
         LAUNCHER_DESKTOP_MODE_TASKBAR_UNPINNED(2242),
+        @UiEvent(doc = "Launcher window insets controller reportedly null")
+        LAUNCHER_WINDOW_INSETS_CONTROLLER_NULL(2400),
         // ADD MORE
     }
 
diff --git a/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java b/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java
index 9acac237a4..07a29bcd04 100644
--- a/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java
@@ -350,9 +350,6 @@ public class PreviewSurfaceRenderer {
                 mHeight / (float) view.getMeasuredHeight());
         view.setScaleX(scale);
         view.setScaleY(scale);
-        LayoutParams lp = new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight());
-        lp.gravity = Gravity.CENTER;
-        view.setLayoutParams(lp);
 
         if (!Flags.newCustomizationPickerUi()) {
             view.setAlpha(mSkipAnimations ? 1 : 0);
@@ -368,7 +365,9 @@ public class PreviewSurfaceRenderer {
             return;
         }
 
-        view.setLayoutParams(new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight()));
+        LayoutParams lp = new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight());
+        lp.gravity = Gravity.CENTER;
+        view.setLayoutParams(lp);
         if (mViewRoot.getChildCount() == 0) {
             mViewRoot.addView(view);
             mViewRoot.animate().alpha(1)