diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 48b5cac2a5191..e908ced06acd5 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -212,7 +212,14 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     @GuardedBy("mLock")
     private boolean mFoldedDeviceState;
 
-    private CameraManager.DeviceStateListener mFoldStateListener;
+    private final CameraManager.DeviceStateListener mFoldStateListener =
+            new CameraManager.DeviceStateListener() {
+                @Override
+                public final void onDeviceStateChanged(boolean folded) {
+                    synchronized (mLock) {
+                        mFoldedDeviceState = folded;
+                    }
+                }};
 
     private static final String TAG = "CameraCharacteristics";
 
@@ -238,18 +245,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     /**
      * Return the device state listener for this Camera characteristics instance
      */
-    CameraManager.DeviceStateListener getDeviceStateListener() {
-        if (mFoldStateListener == null) {
-            mFoldStateListener = new CameraManager.DeviceStateListener() {
-                        @Override
-                        public final void onDeviceStateChanged(boolean folded) {
-                            synchronized (mLock) {
-                                mFoldedDeviceState = folded;
-                            }
-                        }};
-        }
-        return mFoldStateListener;
-    }
+    CameraManager.DeviceStateListener getDeviceStateListener() { return mFoldStateListener; }
 
     /**
      * Overrides the property value
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 85f8ca66715b9..51501b558fba9 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1836,7 +1836,6 @@ public final class CameraManager {
                         ctx.getSystemService(DeviceStateManager.class).registerCallback(
                                 new HandlerExecutor(mDeviceStateHandler), mFoldStateListener);
                     } catch (IllegalStateException e) {
-                        mFoldStateListener = null;
                         Log.v(TAG, "Failed to register device state listener!");
                         Log.v(TAG, "Device state dependent characteristics updates will not be" +
                                 "functional!");
diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
index 98ee98ba67f74..778951a545fa7 100644
--- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java
+++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
@@ -248,10 +248,7 @@ class BLASTSyncEngine {
                     Slog.e(TAG, "WM sent Transaction to organized, but never received" +
                            " commit callback. Application ANR likely to follow.");
                     Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
-                    synchronized (mWm.mGlobalLock) {
-                        onCommitted(merged.mNativeObject != 0
-                                ? merged : mWm.mTransactionFactory.get());
-                    }
+                    onCommitted(merged);
                 }
             };
             CommitCallback callback = new CommitCallback();