diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
index 7965a80deead2..8bbc35fa7c610 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
@@ -403,9 +403,9 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
     }
 
     private void updateDisplayLayout(int displayId) {
-        mDisplayAreaOrganizer.setDisplayLayout(
-                mDisplayController.getDisplayLayout(displayId));
-        mGestureHandler.onDisplayChanged(mDisplayAreaOrganizer.getDisplayLayout());
+        final DisplayLayout newDisplayLayout = mDisplayController.getDisplayLayout(displayId);
+        mDisplayAreaOrganizer.setDisplayLayout(newDisplayLayout);
+        mGestureHandler.onDisplayChanged(newDisplayLayout);
     }
 
     private ContentObserver getObserver(Runnable onChangeRunnable) {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java
index 495362a3eef77..9e83a61667b2a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java
@@ -63,7 +63,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback {
     private boolean mIsEnabled;
     private int mNavGestureHeight;
     private boolean mIsThreeButtonModeEnabled;
-    private int mRotation;
+    private int mRotation = Surface.ROTATION_0;
 
     @VisibleForTesting
     InputMonitor mInputMonitor;