diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
index 16cdfcd1e87ab..2753ae0bcc7fe 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
@@ -89,14 +89,14 @@ fun FlickerTestParameter.statusBarLayerIsVisible() {
 
 fun FlickerTestParameter.navBarLayerRotatesAndScales() {
     assertLayersStart {
-        val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
-            ?: Surface.ROTATION_0
+        val rotation = this.entry.displays.sortedBy { it.id }
+            .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
         this.visibleRegion(FlickerComponentName.NAV_BAR)
                 .coversExactly(WindowUtils.getNavigationBarPosition(rotation))
     }
     assertLayersEnd {
-        val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
-            ?: Surface.ROTATION_0
+        val rotation = this.entry.displays.sortedBy { it.id }
+            .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
         this.visibleRegion(FlickerComponentName.NAV_BAR)
                 .coversExactly(WindowUtils.getNavigationBarPosition(rotation))
     }
@@ -104,14 +104,14 @@ fun FlickerTestParameter.navBarLayerRotatesAndScales() {
 
 fun FlickerTestParameter.statusBarLayerRotatesScales() {
     assertLayersStart {
-        val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
-            ?: Surface.ROTATION_0
+        val rotation = this.entry.displays.sortedBy { it.id }
+            .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
         this.visibleRegion(FlickerComponentName.STATUS_BAR)
             .coversExactly(WindowUtils.getStatusBarPosition(rotation))
     }
     assertLayersEnd {
-        val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation()
-            ?: Surface.ROTATION_0
+        val rotation = this.entry.displays.sortedBy { it.id }
+            .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0
         this.visibleRegion(FlickerComponentName.STATUS_BAR)
             .coversExactly(WindowUtils.getStatusBarPosition(rotation))
     }