diff --git a/src/com/android/customization/picker/grid/GridOptionPreviewer.java b/src/com/android/customization/picker/grid/GridOptionPreviewer.java
index 77fdc43..dac3d9b 100644
--- a/src/com/android/customization/picker/grid/GridOptionPreviewer.java
+++ b/src/com/android/customization/picker/grid/GridOptionPreviewer.java
@@ -62,6 +62,7 @@
         // Reattach SurfaceView to trigger #surfaceCreated to update preview for different option.
         mPreviewContainer.removeAllViews();
         if (mSurfaceCallback != null) {
+            mSurfaceCallback.cleanUp();
             mSurfaceCallback.resetLastSurface();
         }
         if (mGridOptionSurface == null) {