diff --git a/testing/scenario_app/README.md b/testing/scenario_app/README.md
index 131f7186feaf5098ce196049249f892368a71ef3..23685c4dee8aec5cfbb642dde8a71b2c80b562f8 100644
--- a/testing/scenario_app/README.md
+++ b/testing/scenario_app/README.md
@@ -46,7 +46,7 @@ The test is run on a x86 emulator. To run the test locally, you must create an e
 
 ```
 hw.lcd.density = 480
-hw.lcd.height = 1920
+hw.lcd.height = 1680
 hw.lcd.width = 1080
 lcd.depth = 16
 ```
diff --git a/testing/scenario_app/android/android/gradle-home/.cache/daemon/5.6.4/registry.bin b/testing/scenario_app/android/android/gradle-home/.cache/daemon/5.6.4/registry.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0f3905597f5bd4e03874f3612dabc22511cc807f
Binary files /dev/null and b/testing/scenario_app/android/android/gradle-home/.cache/daemon/5.6.4/registry.bin differ
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java
index d060bf6ccb907defef156a32bd170f875f6674a4..b3c16d9f517015870be02d1bb574b85d9236197e 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java
@@ -4,8 +4,6 @@
 
 package dev.flutter.scenariosui;
 
-import android.app.Activity;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
@@ -129,28 +127,6 @@ public class ScreenshotUtil {
     album = null;
   }
 
-  private static int getStatusBarHeight() {
-    final Context context = InstrumentationRegistry.getTargetContext();
-    // Resource name defined in
-    // https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/values/dimens.xml#34
-    final int resourceId =
-        context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-    int statusBarHeight = 0;
-    if (resourceId > 0) {
-      statusBarHeight = context.getResources().getDimensionPixelSize(resourceId);
-    }
-    return statusBarHeight;
-  }
-
-  private static int getActionBarHeight(Activity activity) {
-    int actionBarHeight = 0;
-    final android.content.res.TypedArray styledAttributes =
-        activity.getTheme().obtainStyledAttributes(new int[] {android.R.attr.actionBarSize});
-    actionBarHeight = (int) styledAttributes.getDimension(0, 0);
-    styledAttributes.recycle();
-    return actionBarHeight;
-  }
-
   /**
    * Captures a screenshot of {@code TestableFlutterActivity}.
    *
@@ -182,13 +158,7 @@ public class ScreenshotUtil {
             Bitmap bitmap =
                 InstrumentationRegistry.getInstrumentation().getUiAutomation().takeScreenshot();
             // Remove the status and action bars from the screenshot capture.
-            bitmap =
-                Bitmap.createBitmap(
-                    bitmap,
-                    0,
-                    getStatusBarHeight(),
-                    bitmap.getWidth(),
-                    bitmap.getHeight() - getStatusBarHeight() - getActionBarHeight(activity));
+            bitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight());
 
             final String screenshotName = String.format("%s__%s", testClass, testName);
             // Write bitmap to the album.
diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml
index 1ddceaf516d8baf6c1b1cce2c25d5622b91dcb21..d5a088de8c355552d02180ec5ff83090109229e5 100644
--- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml
+++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/FullScreenScreenshot">
             <intent-filter>
                 <action android:name="com.google.intent.action.TEST_LOOP" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/testing/scenario_app/android/app/src/main/res/values/styles.xml b/testing/scenario_app/android/app/src/main/res/values/styles.xml
index 545b9c6d2c45df7938f8ffd5ac2d806dec36f122..26fb230141be63207f29b8125be88cb05262ecef 100644
--- a/testing/scenario_app/android/app/src/main/res/values/styles.xml
+++ b/testing/scenario_app/android/app/src/main/res/values/styles.xml
@@ -8,9 +8,11 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+    <style name="FullScreenScreenshot">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png
index 731fa2cef4e5bc3d6cc81415571f6fe9d5e5da8b..263e1283f88d2c1cce0c625507cb6a0c52abba81 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png
index 71a76132e5a05373d4a960b4e306394d55814e84..faf11d3db4435e1dc06d9bb140e453aeb3e090e1 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png
index fa335e53e51ccd6b316e2b8b20ba403037897013..e9d6bfef53dbc2cb65282e6375f8416534b48832 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png
index d827032a9b2392cfb85f4811805d35db71fb0cc0..16c1490f66c7087fa21b80d4f6b1770d9cd8b511 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png
index 3d7afa83ca45119bc85b34ab893ad32cf9015374..0f104c64a98f0b51bcd131e926f04ae476ab855a 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png
index 03df55e98afda985eddc81de5c64e67d911b57cc..15e890439b23c918ce4f2f347285b64658c3be27 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png
index 24c9c9d3278e2500cd127bcfe1660541be1c03f6..044004dc4e006aeeb6dba3c89921aebeee17c374 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png
index 30c42c9ea7d2e8c96414e002f6b7e45988033eb9..a897218d1bda718b4557a5d2b109c4a008c6c67f 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png
index 183f24f433da5000607e53e4cc0a33452655f4f5..9c02626ecefd1b2794ee254ae51c17054b36a4fa 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png
index a543b54742eaea1acf3637520c39e7727475580e..6c8d1a36d60adf71e37a4b2f49a6f3132ea9c93f 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png
index d0679ad960c1a09489b771473a1b75305bb83626..816ec0da23e81152fab6efb33de94392eb5a7179 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformView.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformView.png
index 1cc75de30df9b81e0a6bd512b7a268ca65bbf438..d411ed0c6b8dc4790f29e8ce2b751b36f60e2604 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformView.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformView.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewClippath.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewClippath.png
index b1661885e11148f6645a7112576e7f33089df48d..347838856aa87c7a112d8bd3e6acf8b10935f9cf 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewClippath.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewClippath.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprect.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprect.png
index b02a10caf6e9ed358d8ff375ec15a4b72232b45e..a264a744ecf19108d66160e72b950030041f4277 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprect.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprect.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprrect.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprrect.png
index e97edb37e4fc3950ae0ffab64b5a5e5d4db30ad4..301478a93cb7eda5cd2148072bfad9d71ed4a70b 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprrect.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewCliprrect.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultiple.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultiple.png
index d964f72ac5a44ced60d2ae521c2d065418c67551..444328e879be612bc5dca158fc1ec01db7c1855f 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultiple.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultiple.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleBackgroundForeground.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleBackgroundForeground.png
index 989e339d90e6ea619b0ebce31a6a27c37fb4658f..a7513dea936d5c2f51baaa86091383a43146141e 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleBackgroundForeground.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleBackgroundForeground.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleWithoutOverlays.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleWithoutOverlays.png
index de135f9fbbae94c938572e1dc115bb85b35e7996..9809181e20aea22ad4cff37e8fbcca800952f172 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleWithoutOverlays.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewMultipleWithoutOverlays.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewOpacity.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewOpacity.png
index 5a4671cc0a4a7f4a6c63dcd8192329d539a45fa0..4689dbf67666beb3bedd17bf224d8d695180c529 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewOpacity.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewOpacity.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewRotate.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewRotate.png
index a0c3ab7d20e6c406852c8c64fd1947ac9acce115..97d16d595c1b6eecd5377f45b1ca8012bcf2237e 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewRotate.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewRotate.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTransform.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTransform.png
index ee7c7f1bd45bedc92538bb0a7b14d143479844c0..5a64737cbec2293fbd3584932fe324842b93e1a1 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTransform.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTransform.png differ
diff --git a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTwoIntersectingOverlays.png b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTwoIntersectingOverlays.png
index d56e416e633f40443f3e460876ab0cbdfff1c3b4..43f91c131162eea990831c2721287159ea1c230d 100644
Binary files a/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTwoIntersectingOverlays.png and b/testing/scenario_app/android/reports/screenshots/dev.flutter.scenariosui.PlatformViewUiTests__testPlatformViewTwoIntersectingOverlays.png differ
diff --git a/testing/scenario_app/compile_android_jit.sh b/testing/scenario_app/compile_android_jit.sh
index 8097cd9bff7104e078ae37b4fb7f583d82414747..01a7288e2e18b623cd550e9e0c08f9c4ead5945f 100755
--- a/testing/scenario_app/compile_android_jit.sh
+++ b/testing/scenario_app/compile_android_jit.sh
@@ -39,7 +39,7 @@ fi
 
 if [[ ! -d "$DEVICE_TOOLS" ]]; then
   echo "Directory $DEVICE_TOOLS not found."
-  ehco "Second argument must specify the device out directory containing gen_snapshot (e.g. android_debug_unopt_x64)."
+  echo "Second argument must specify the device out directory containing gen_snapshot (e.g. android_debug_unopt_x64)."
   exit 1
 fi
 
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
index fa335a338c6a5d0e0b17e32eeb75200b5a3fb8eb..ac301f3922b3bc45ab12c90ef797928301cee2c9 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
@@ -195,30 +195,30 @@
 
   XCUIElement* platform_view1 = app.textViews[@"platform_view[0]"];
   XCTAssertTrue([platform_view1 waitForExistenceWithTimeout:1.0]);
-  XCTAssertEqual(platform_view1.frame.origin.x, 25);
+  XCTAssertEqual(platform_view1.frame.origin.x, 50);
   XCTAssertEqual(platform_view1.frame.origin.y, 325);
   XCTAssertEqual(platform_view1.frame.size.width, 250);
   XCTAssertEqual(platform_view1.frame.size.height, 250);
 
   XCUIElement* platform_view2 = app.textViews[@"platform_view[1]"];
   XCTAssertTrue(platform_view2.exists);
-  XCTAssertEqual(platform_view2.frame.origin.x, 25);
+  XCTAssertEqual(platform_view2.frame.origin.x, 50);
   XCTAssertEqual(platform_view2.frame.origin.y, 25);
   XCTAssertEqual(platform_view2.frame.size.width, 250);
   XCTAssertEqual(platform_view2.frame.size.height, 250);
 
   XCUIElement* overlay1 = app.otherElements[@"platform_view[0].overlay[0]"];
   XCTAssertTrue(overlay1.exists);
-  XCTAssertEqual(overlay1.frame.origin.x, 25);
+  XCTAssertEqual(overlay1.frame.origin.x, 50);
   XCTAssertEqual(overlay1.frame.origin.y, 325);
-  XCTAssertEqual(overlay1.frame.size.width, 225);
+  XCTAssertEqual(overlay1.frame.size.width, 200);
   XCTAssertEqual(overlay1.frame.size.height, 175);
 
   XCUIElement* overlay2 = app.otherElements[@"platform_view[1].overlay[0]"];
   XCTAssertTrue(overlay2.exists);
-  XCTAssertEqual(overlay2.frame.origin.x, 25);
+  XCTAssertEqual(overlay2.frame.origin.x, 50);
   XCTAssertEqual(overlay2.frame.origin.y, 25);
-  XCTAssertEqual(overlay2.frame.size.width, 225);
+  XCTAssertEqual(overlay2.frame.size.width, 200);
   XCTAssertEqual(overlay2.frame.size.height, 250);
 }
 
diff --git a/testing/scenario_app/lib/src/platform_view.dart b/testing/scenario_app/lib/src/platform_view.dart
index fd6f5f47887e9bcaedfdf9570e5ccb59c49dc47a..8fffe8c21bb388b42502ce933e17a5dcd322b6f2 100644
--- a/testing/scenario_app/lib/src/platform_view.dart
+++ b/testing/scenario_app/lib/src/platform_view.dart
@@ -46,8 +46,6 @@ class PlatformViewScenario extends Scenario with _BasePlatformViewScenarioMixin
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     finishBuilderByAddingPlatformViewAndPicture(builder, id);
   }
 }
@@ -70,8 +68,6 @@ class PlatformViewNoOverlayIntersectionScenario extends Scenario with _BasePlatf
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     finishBuilderByAddingPlatformViewAndPicture(
       builder,
       id,
@@ -98,8 +94,6 @@ class PlatformViewPartialIntersectionScenario extends Scenario with _BasePlatfor
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     finishBuilderByAddingPlatformViewAndPicture(
       builder,
       id,
@@ -126,8 +120,6 @@ class PlatformViewTwoIntersectingOverlaysScenario extends Scenario with _BasePla
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     _addPlatformViewToScene(builder, id, 500, 500);
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
@@ -167,8 +159,6 @@ class PlatformViewOneOverlayTwoIntersectingOverlaysScenario extends Scenario wit
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     _addPlatformViewToScene(builder, id, 500, 500);
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
@@ -217,8 +207,6 @@ class MultiPlatformViewWithoutOverlaysScenario extends Scenario with _BasePlatfo
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     builder.pushOffset(0, 600);
     _addPlatformViewToScene(builder, firstId, 500, 500);
     builder.pop();
@@ -259,8 +247,6 @@ class PlatformViewMaxOverlaysScenario extends Scenario with _BasePlatformViewSce
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     _addPlatformViewToScene(builder, id, 500, 500);
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
@@ -314,8 +300,6 @@ class MultiPlatformViewScenario extends Scenario with _BasePlatformViewScenarioM
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     builder.pushOffset(0, 600);
     _addPlatformViewToScene(builder, firstId, 500, 500);
     builder.pop();
@@ -357,13 +341,13 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario with _BaseP
   void _firstFrame() {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
-    builder.pushOffset(0, 600);
+    builder.pushOffset(50, 600);
     _addPlatformViewToScene(builder, firstId, 500, 500);
     builder.pop();
 
+    builder.pushOffset(50, 0);
     _addPlatformViewToScene(builder, secondId, 500, 500);
+    builder.pop();
 
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
@@ -374,7 +358,6 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario with _BaseP
     final Picture picture = recorder.endRecording();
     builder.addPicture(const Offset(0, 0), picture);
 
-    builder.pop();
     final Scene scene = builder.build();
     window.render(scene);
     scene.dispose();
@@ -383,13 +366,12 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario with _BaseP
   void _secondFrame() {
     final SceneBuilder builder = SceneBuilder();
 
-    builder.pushOffset(0, 0);
-
     builder.pushOffset(0, 600);
     _addPlatformViewToScene(builder, firstId, 500, 500);
     builder.pop();
 
     _addPlatformViewToScene(builder, secondId, 500, 500);
+
     final Scene scene = builder.build();
     window.render(scene);
     scene.dispose();
@@ -430,9 +412,10 @@ class PlatformViewClipRectScenario extends Scenario with _BasePlatformViewScenar
 
   @override
   void onBeginFrame(Duration duration) {
-    final SceneBuilder builder = SceneBuilder();
-    builder.pushOffset(0, 0);
-    builder.pushClipRect(const Rect.fromLTRB(100, 100, 400, 400));
+    final SceneBuilder builder =
+      SceneBuilder()
+      ..pushClipRect(const Rect.fromLTRB(100, 100, 400, 400));
+
     finishBuilderByAddingPlatformViewAndPicture(builder, id);
   }
 }
@@ -446,8 +429,6 @@ class PlatformViewClipRRectScenario extends PlatformViewScenario {
   @override
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(0, 0);
     builder.pushClipRRect(
       RRect.fromLTRBAndCorners(
         100,
@@ -471,18 +452,14 @@ class PlatformViewClipPathScenario extends PlatformViewScenario {
 
   @override
   void onBeginFrame(Duration duration) {
-    final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(0, 0);
-
     final Path path = Path()
       ..moveTo(100, 100)
       ..quadraticBezierTo(50, 250, 100, 400)
       ..lineTo(350, 400)
       ..cubicTo(400, 300, 300, 200, 350, 100)
       ..close();
-    builder.pushClipPath(path);
 
+    final SceneBuilder builder = SceneBuilder()..pushClipPath(path);
     finishBuilderByAddingPlatformViewAndPicture(builder, id);
   }
 }
@@ -495,15 +472,12 @@ class PlatformViewTransformScenario extends PlatformViewScenario {
 
   @override
   void onBeginFrame(Duration duration) {
-    final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(0, 0);
     final Matrix4 matrix4 = Matrix4.identity()
       ..rotateZ(1)
       ..scale(0.5, 0.5, 1.0)
       ..translate(1000.0, 100.0, 0.0);
 
-    builder.pushTransform(matrix4.storage);
+    final SceneBuilder builder = SceneBuilder()..pushTransform(matrix4.storage);
 
     finishBuilderByAddingPlatformViewAndPicture(builder, id);
   }
@@ -517,11 +491,7 @@ class PlatformViewOpacityScenario extends PlatformViewScenario {
 
   @override
   void onBeginFrame(Duration duration) {
-    final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(0, 0);
-    builder.pushOpacity(150);
-
+    final SceneBuilder builder = SceneBuilder()..pushOpacity(150);
     finishBuilderByAddingPlatformViewAndPicture(builder, id);
   }
 }
@@ -600,15 +570,11 @@ class PlatformViewForTouchIOSScenario extends Scenario
 
   void _firstFrame() {
     final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(0, 0);
     finishBuilderByAddingPlatformViewAndPicture(builder, _viewId);
   }
 
   void _secondFrame() {
-    final SceneBuilder builder = SceneBuilder();
-
-    builder.pushOffset(5, 5);
+    final SceneBuilder builder = SceneBuilder()..pushOffset(5, 5);
     finishBuilderByAddingPlatformViewAndPicture(builder, _viewId);
   }
 }