[metrics] Run Android RenderTestRunner bot in rebaseline modeupstream/zmiao-bot-auto-rebaseline

1151 files changed, 89 insertions, 17 deletions

diff --git a/circle.yml b/circle.yml
index ec085f2a63..f14b4e2488 100644
--- a/circle.yml
+++ b/circle.yml
@@ -678,6 +678,14 @@ jobs:
               mkdir -p /tmp/tests/render-test-app
               gsutil cp $testResult /tmp/tests/render-test-app | true
             fi
+      - run:
+          name: Retrieve Rebaselined Metrics from gcloud
+          when: on_fail
+          command: |
+            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
+              metricsResult=$(gsutil ls -d gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/*/*/sdcard/render-tests/)
+              gsutil -m cp -r $metricsResult metrics/next-android-render-test-runner/render-tests/ | true
+            fi
       - next-save
   next-sanity-checks:
     executor: ubuntu-disco
diff --git a/render-test/android-manifest-probe-network-gfx.json b/metrics/next-android-render-test-runner-probe-gfx-network.json
index c7b45417d0..db341e43ca 100644
--- a/render-test/android-manifest-probe-network-gfx.json
+++ b/metrics/next-android-render-test-runner-probe-gfx-network.json
@@ -6,5 +6,5 @@
     "asset_path": "mapbox-gl-js/test/integration",
     "result_path":"/sdcard/",
     "probes": ["probeGFX", "probeNetwork"],
-    "metric_path":"render-test/metrics/android"
+    "metric_path":"metrics/next-android-render-test-runner"
 }  
\ No newline at end of file
diff --git a/render-test/android-manifest-probe-memory.json b/metrics/next-android-render-test-runner-probe-memory.json
index a90d39ee83..aa99c5a618 100644
--- a/render-test/android-manifest-probe-memory.json
+++ b/metrics/next-android-render-test-runner-probe-memory.json
@@ -6,6 +6,6 @@
     "asset_path": "mapbox-gl-js/test/integration",
     "result_path":"/sdcard/",
     "probes": ["probeMemory"],
-    "metric_path":"render-test/metrics/android",
+    "metric_path":"metrics/next-android-render-test-runner",
     "filter": "real-world"
 }  
\ No newline at end of file
diff --git a/render-test/metrics/android/render-tests/background-color/colorSpace-hcl/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-hcl/metrics.json
index d4c17e7e49..d4c17e7e49 100644
--- a/render-test/metrics/android/render-tests/background-color/colorSpace-hcl/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-hcl/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
index 2cc38518ad..2cc38518ad 100644
--- a/render-test/metrics/android/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json
index caf4cb2d9c..caf4cb2d9c 100644
--- a/render-test/metrics/android/render-tests/background-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json
index a7b482647f..a7b482647f 100644
--- a/render-test/metrics/android/render-tests/background-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json
index bdcdbf1330..bdcdbf1330 100644
--- a/render-test/metrics/android/render-tests/background-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-color/transition/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-color/transition/metrics.json
index 3d01202f49..3d01202f49 100644
--- a/render-test/metrics/android/render-tests/background-color/transition/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-color/transition/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-opacity/color/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json
index 1e44676e15..1e44676e15 100644
--- a/render-test/metrics/android/render-tests/background-opacity/color/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-opacity/image/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json
index 1e8d9b7e5b..1e8d9b7e5b 100644
--- a/render-test/metrics/android/render-tests/background-opacity/image/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-opacity/overlay/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
index c6af1492d9..c6af1492d9 100644
--- a/render-test/metrics/android/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
index e878d77231..e878d77231 100644
--- a/render-test/metrics/android/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json
index a93f4dd304..a93f4dd304 100644
--- a/render-test/metrics/android/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json
index fa3e26665b..fa3e26665b 100644
--- a/render-test/metrics/android/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/pitch/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
index 031611c483..031611c483 100644
--- a/render-test/metrics/android/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
index 18cc5f28da..18cc5f28da 100644
--- a/render-test/metrics/android/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-pattern/zoomed/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
index a93f4dd304..a93f4dd304 100644
--- a/render-test/metrics/android/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json
index d03f19413a..d03f19413a 100644
--- a/render-test/metrics/android/render-tests/background-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/background-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json
index 74a2da9b88..74a2da9b88 100644
--- a/render-test/metrics/android/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
index eb257e9711..eb257e9711 100644
--- a/render-test/metrics/android/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/render-test/metrics/android/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
index 6de103b667..6de103b667 100644
--- a/render-test/metrics/android/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/render-test/metrics/android/render-tests/basic-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json
index 5b7d693384..5b7d693384 100644
--- a/render-test/metrics/android/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json
diff --git a/render-test/metrics/android/render-tests/bright-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json
index 22e64797a6..22e64797a6 100644
--- a/render-test/metrics/android/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/blending/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json
index a552a1910d..a552a1910d 100644
--- a/render-test/metrics/android/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json
index 0ac2fbbdc2..0ac2fbbdc2 100644
--- a/render-test/metrics/android/render-tests/circle-blur/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json
index 7f0e754f5c..7f0e754f5c 100644
--- a/render-test/metrics/android/render-tests/circle-blur/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
index d1d1fa1869..d1d1fa1869 100644
--- a/render-test/metrics/android/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json
index 9eeb8abe43..9eeb8abe43 100644
--- a/render-test/metrics/android/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
index 2b721fa96f..2b721fa96f 100644
--- a/render-test/metrics/android/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 740fab7f14..740fab7f14 100644
--- a/render-test/metrics/android/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json
index 501bf7ea74..501bf7ea74 100644
--- a/render-test/metrics/android/render-tests/circle-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json
index 3b75b71395..3b75b71395 100644
--- a/render-test/metrics/android/render-tests/circle-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json
index 539f2e57b3..539f2e57b3 100644
--- a/render-test/metrics/android/render-tests/circle-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json
index 7bb6fc34b2..7bb6fc34b2 100644
--- a/render-test/metrics/android/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
index a93259a151..a93259a151 100644
--- a/render-test/metrics/android/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
index 73e7e4a85b..73e7e4a85b 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
index 9e2faa33e4..9e2faa33e4 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/multipoint/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
index 05038cde89..05038cde89 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
index 31ceb9b9fb..31ceb9b9fb 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json
index 30aa15cc0f..30aa15cc0f 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-geometry/polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
index 77492172ef..77492172ef 100644
--- a/render-test/metrics/android/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/blending/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
index 3227e8507b..3227e8507b 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json
index c92b131fd3..c92b131fd3 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json
index 01afaeaac7..01afaeaac7 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
index 7fc73e62d0..7fc73e62d0 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
index a24a2a8733..a24a2a8733 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 68ef84717b..68ef84717b 100644
--- a/render-test/metrics/android/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 5645250be9..5645250be9 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index c43295c9fb..c43295c9fb 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index d8fcba225c..d8fcba225c 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 26978a5dc4..26978a5dc4 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-scale/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
index 8b29e5de73..8b29e5de73 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-scale/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
index 9527453a5f..9527453a5f 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
index b1b129aa4c..b1b129aa4c 100644
--- a/render-test/metrics/android/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/antimeridian/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
index 791cd58942..791cd58942 100644
--- a/render-test/metrics/android/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json
index 836de67ac4..836de67ac4 100644
--- a/render-test/metrics/android/render-tests/circle-radius/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json
index 9786937fda..9786937fda 100644
--- a/render-test/metrics/android/render-tests/circle-radius/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json
index 13a718431b..13a718431b 100644
--- a/render-test/metrics/android/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
index 6acc22be6e..6acc22be6e 100644
--- a/render-test/metrics/android/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
index d6c0df43f3..d6c0df43f3 100644
--- a/render-test/metrics/android/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-sort-key/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json
index 37494d86ff..37494d86ff 100644
--- a/render-test/metrics/android/render-tests/circle-sort-key/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-sort-key/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
index 76b8087bca..76b8087bca 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
index 1fc3239e25..1fc3239e25 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
index 26b1dc4f68..26b1dc4f68 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
index 06fe3dc749..06fe3dc749 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index 727cd45458..727cd45458 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
index ba598c2dc3..ba598c2dc3 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
index be22b067c9..be22b067c9 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
index 89378d16ad..89378d16ad 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
index a0abb8cc3a..a0abb8cc3a 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index 474c59062c..474c59062c 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2930ea3f79..2930ea3f79 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
index e9bf5293aa..e9bf5293aa 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
index 8994c65e5b..8994c65e5b 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
index 36764ce787..36764ce787 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
index 525715f579..525715f579 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 0f6d40c86a..0f6d40c86a 100644
--- a/render-test/metrics/android/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
index a5aa8b422b..a5aa8b422b 100644
--- a/render-test/metrics/android/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
index 451f0fd730..451f0fd730 100644
--- a/render-test/metrics/android/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json
index bc4d9070d9..bc4d9070d9 100644
--- a/render-test/metrics/android/render-tests/circle-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json
index d0b2679562..d0b2679562 100644
--- a/render-test/metrics/android/render-tests/circle-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/circle-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json
index d9357fadba..d9357fadba 100644
--- a/render-test/metrics/android/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/collator/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/collator/default/metrics.json
index a1653c318e..a1653c318e 100644
--- a/render-test/metrics/android/render-tests/collator/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/collator/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/collator/resolved-locale/metrics.json b/metrics/next-android-render-test-runner/render-tests/collator/resolved-locale/metrics.json
index df0b5aeece..df0b5aeece 100644
--- a/render-test/metrics/android/render-tests/collator/resolved-locale/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/collator/resolved-locale/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
index 410b435c1f..410b435c1f 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
index 0e3215fc64..0e3215fc64 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index 8f2340572b..8f2340572b 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 3c5fe446e4..3c5fe446e4 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index f3a4eda8f0..f3a4eda8f0 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index d403d78e1b..d403d78e1b 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 7aea2c418e..7aea2c418e 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index 4d3d12cc31..4d3d12cc31 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
index cae230833d..cae230833d 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index 07ed52798f..07ed52798f 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index 70b18db270..70b18db270 100644
--- a/render-test/metrics/android/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
index be142dfa55..be142dfa55 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
index 7b34d09c91..7b34d09c91 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index db4d4e7f70..db4d4e7f70 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 75256dd67f..75256dd67f 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 0f9aff46d7..0f9aff46d7 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 24692d348d..24692d348d 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 96ba1215cb..96ba1215cb 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index 16b7d6aaf1..16b7d6aaf1 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 8745a0cc33..8745a0cc33 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index 11808789a0..11808789a0 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index e0c63c1f55..e0c63c1f55 100644
--- a/render-test/metrics/android/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index 16d4f386b8..16d4f386b8 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index bfc53bf732..bfc53bf732 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index b9053644c7..b9053644c7 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d008653d31..d008653d31 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index a8734b03a4..a8734b03a4 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 2411851b72..2411851b72 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index 07f1431dba..07f1431dba 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 6d00fc139e..6d00fc139e 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index d8d993f64a..d8d993f64a 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 58f0eeae8b..58f0eeae8b 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index cacf226188..cacf226188 100644
--- a/render-test/metrics/android/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 9654cd4600..9654cd4600 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 90eaa067b9..90eaa067b9 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 4c5ea24ff3..4c5ea24ff3 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index aa60302d34..aa60302d34 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index fc78ef193d..fc78ef193d 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 99a465de1a..99a465de1a 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 1017c0d9d9..1017c0d9d9 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index 764e8cdff5..764e8cdff5 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index 15c23c8668..15c23c8668 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index b7b4a46d51..b7b4a46d51 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index 26c8b32a12..26c8b32a12 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index 14103b636f..14103b636f 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index dcb58bc9cd..dcb58bc9cd 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index 1506031675..1506031675 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index 40d15d66bd..40d15d66bd 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 46e1a66b3a..46e1a66b3a 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index ef4b74e030..ef4b74e030 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 60bd622aa2..60bd622aa2 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 0e5749da5a..0e5749da5a 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 0e73527f91..0e73527f91 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 60830ca295..60830ca295 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index d715edc9a1..d715edc9a1 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index 807dd9acc3..807dd9acc3 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index 362e363a01..362e363a01 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index 66be429cf6..66be429cf6 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index 5f034d933a..5f034d933a 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 69b4ae576f..69b4ae576f 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 72133d286e..72133d286e 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 30aa337c06..30aa337c06 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index ba4b44a1e2..ba4b44a1e2 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 9c61ed082e..9c61ed082e 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index f1a2f3a71c..f1a2f3a71c 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index cf8a4e7c03..cf8a4e7c03 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index 635fc60292..635fc60292 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index 39a576f70e..39a576f70e 100644
--- a/render-test/metrics/android/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 8307b6e507..8307b6e507 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index db2dc2ecb6..db2dc2ecb6 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index 5715a70325..5715a70325 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index dd3af35edd..dd3af35edd 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 828cbdfeda..828cbdfeda 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 1bc01f7951..1bc01f7951 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 63a366a95e..63a366a95e 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index 2b18737585..2b18737585 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index 05e725b5a6..05e725b5a6 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 513708a870..513708a870 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 687f12ab9c..687f12ab9c 100644
--- a/render-test/metrics/android/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 5dc4bce432..5dc4bce432 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index e2ee2cbac9..e2ee2cbac9 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 4ac8d3a472..4ac8d3a472 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index 7c56f7511f..7c56f7511f 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 0efbb5ca20..0efbb5ca20 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index a74dc24266..a74dc24266 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index f8272af5c3..f8272af5c3 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index b84859758e..b84859758e 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 69d5dbad2a..69d5dbad2a 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index ecb4302faf..ecb4302faf 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 466b4e60ff..466b4e60ff 100644
--- a/render-test/metrics/android/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 789a619eae..789a619eae 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 0ae456d3fb..0ae456d3fb 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 1c360d91f3..1c360d91f3 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index 08c13e8bad..08c13e8bad 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index 017d039bcc..017d039bcc 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index 317784cd1b..317784cd1b 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index 7531d9573d..7531d9573d 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index e79b45f5a3..e79b45f5a3 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
index fcafc3c74c..fcafc3c74c 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index 6d1ec8a92d..6d1ec8a92d 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index 8ea9449a0e..8ea9449a0e 100644
--- a/render-test/metrics/android/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 40263bf5be..40263bf5be 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 3d02398d4e..3d02398d4e 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index aebc5feef8..aebc5feef8 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index 2aa880b9e4..2aa880b9e4 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index accccfc02c..accccfc02c 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a3546beab7..a3546beab7 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 05b1dc5b8e..05b1dc5b8e 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index e4a12d00cd..e4a12d00cd 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index be8a827b11..be8a827b11 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 62056a0ea6..62056a0ea6 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index fec42e5c4c..fec42e5c4c 100644
--- a/render-test/metrics/android/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index a2100b6615..a2100b6615 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 387e403ca7..387e403ca7 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index fcec8eaa9c..fcec8eaa9c 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index 2a5451fdf1..2a5451fdf1 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index 1cde7c1a71..1cde7c1a71 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index d19d98c95f..d19d98c95f 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 36914435cb..36914435cb 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index d13be211df..d13be211df 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index a66a9339bb..a66a9339bb 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 77e10e834e..77e10e834e 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 1663ed3c6f..1663ed3c6f 100644
--- a/render-test/metrics/android/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
index cb7c3efc64..cb7c3efc64 100644
--- a/render-test/metrics/android/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
index 6a4f1cb598..6a4f1cb598 100644
--- a/render-test/metrics/android/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
index 7c268c3d07..7c268c3d07 100644
--- a/render-test/metrics/android/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
index b32a7e7b0a..b32a7e7b0a 100644
--- a/render-test/metrics/android/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-lines/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json
index bc5f31e5b2..bc5f31e5b2 100644
--- a/render-test/metrics/android/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
index 1fdcc62959..1fdcc62959 100644
--- a/render-test/metrics/android/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
index 15448feba7..15448feba7 100644
--- a/render-test/metrics/android/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
index bf6d2e8101..bf6d2e8101 100644
--- a/render-test/metrics/android/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/collision/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/collision/metrics.json
index 898a41f252..898a41f252 100644
--- a/render-test/metrics/android/render-tests/debug/collision/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/collision/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/overdraw/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/overdraw/metrics.json
index a7b7c7106a..a7b7c7106a 100644
--- a/render-test/metrics/android/render-tests/debug/overdraw/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/overdraw/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/raster/metrics.json
index 70a5167fa9..70a5167fa9 100644
--- a/render-test/metrics/android/render-tests/debug/raster/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/raster/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/tile-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/tile-overscaled/metrics.json
index 4f0aecca6e..4f0aecca6e 100644
--- a/render-test/metrics/android/render-tests/debug/tile-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/tile-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/debug/tile/metrics.json b/metrics/next-android-render-test-runner/render-tests/debug/tile/metrics.json
index ccc25e8951..ccc25e8951 100644
--- a/render-test/metrics/android/render-tests/debug/tile/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/debug/tile/metrics.json
diff --git a/render-test/metrics/android/render-tests/empty/empty/metrics.json b/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json
index 800fcba1fb..800fcba1fb 100644
--- a/render-test/metrics/android/render-tests/empty/empty/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json
diff --git a/render-test/metrics/android/render-tests/extent/1024-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-circle/metrics.json
index 921b23fc3d..921b23fc3d 100644
--- a/render-test/metrics/android/render-tests/extent/1024-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/extent/1024-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/extent/1024-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json
index 9076dbe4f6..9076dbe4f6 100644
--- a/render-test/metrics/android/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/extent/1024-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json
index 998e8502a0..998e8502a0 100644
--- a/render-test/metrics/android/render-tests/extent/1024-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/extent/1024-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
index 18aa1f26bf..18aa1f26bf 100644
--- a/render-test/metrics/android/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/feature-state/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
index 453a5d0b86..453a5d0b86 100644
--- a/render-test/metrics/android/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/feature-state/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
index aff3d03c49..aff3d03c49 100644
--- a/render-test/metrics/android/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/feature-state/vector-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
index 6cbf7a6c6a..6cbf7a6c6a 100644
--- a/render-test/metrics/android/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-antialias/false/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json
index 9970db1485..9970db1485 100644
--- a/render-test/metrics/android/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json
index 8ef2ed2178..8ef2ed2178 100644
--- a/render-test/metrics/android/render-tests/fill-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json
index 489e2af2da..489e2af2da 100644
--- a/render-test/metrics/android/render-tests/fill-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json
index 9cde101c97..9cde101c97 100644
--- a/render-test/metrics/android/render-tests/fill-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json
index 5c54e39dcb..5c54e39dcb 100644
--- a/render-test/metrics/android/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json
index 199ca0c382..199ca0c382 100644
--- a/render-test/metrics/android/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json
index a99a8dd54b..a99a8dd54b 100644
--- a/render-test/metrics/android/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
index 1852f99030..1852f99030 100644
--- a/render-test/metrics/android/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
index db67c4597c..db67c4597c 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
index 0ffe71014f..0ffe71014f 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
index a4d19a6d2f..a4d19a6d2f 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
index f07cceddf1..f07cceddf1 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
index 28414df5fb..28414df5fb 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 35df3ee61c..35df3ee61c 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
index 42bede2168..42bede2168 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
index e33c6489b5..e33c6489b5 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
index c92c4fcca4..c92c4fcca4 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 57df05e972..57df05e972 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
index 2011b084b2..2011b084b2 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index efe60d2344..efe60d2344 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-geometry/linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-geometry/linestring/metrics.json
index 5d5868911a..5d5868911a 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-geometry/linestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-geometry/linestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-height/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
index 20fe62a97e..20fe62a97e 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-height/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
index c7bb0415e1..c7bb0415e1 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
index c3244817f0..c3244817f0 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
index 0c3fcea076..0c3fcea076 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index 28809d2aa6..28809d2aa6 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index 4b1d346192..4b1d346192 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
index d75fba891e..d75fba891e 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
index 281d95f050..281d95f050 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
index 49b51a2521..49b51a2521 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
index 19ffb2906b..19ffb2906b 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/@2x/metrics.json
index 4068a1b051..4068a1b051 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/@2x/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/@2x/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/feature-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/feature-expression/metrics.json
index daa64a9f46..daa64a9f46 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/feature-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/feature-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/function-2/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/function-2/metrics.json
index d1c45d2c97..d1c45d2c97 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/function-2/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/function-2/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/function/metrics.json
index dbdd9d8a08..dbdd9d8a08 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/literal/metrics.json
index ec9a62965f..ec9a62965f 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
index a96f633d56..a96f633d56 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/opacity/metrics.json
index f53ef49d9d..f53ef49d9d 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-pattern/tile-buffer/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/tile-buffer/metrics.json
index 40c88a60fc..40c88a60fc 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-pattern/tile-buffer/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/tile-buffer/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index b1ff88e69f..b1ff88e69f 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index e9d354c421..e9d354c421 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
index 2e0e0b0256..2e0e0b0256 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
index f2738f2148..f2738f2148 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index e2c777dfd3..e2c777dfd3 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
index 857b535a33..857b535a33 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index d6f392c6f7..d6f392c6f7 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index ce67d94a08..ce67d94a08 100644
--- a/render-test/metrics/android/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json
index 08d7be6c04..08d7be6c04 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json
index af75baf2c1..af75baf2c1 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
index 8fecc7f5f3..8fecc7f5f3 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index b9f9e83d94..b9f9e83d94 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/overlapping/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
index dd5a5aa7ea..dd5a5aa7ea 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
index 86cd1d2b13..86cd1d2b13 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
index 81dc9c4e54..81dc9c4e54 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
index c0f65347fb..c0f65347fb 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index f564c642fa..f564c642fa 100644
--- a/render-test/metrics/android/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
index 8e60ee7e3e..8e60ee7e3e 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
index d00f857b1c..d00f857b1c 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
index 2cb179c774..2cb179c774 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
index f2e812199b..f2e812199b 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
index 6248eff616..6248eff616 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
index 6c66e58342..6c66e58342 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
index 73b7da9fea..73b7da9fea 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index c43b2d87ac..c43b2d87ac 100644
--- a/render-test/metrics/android/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
index 68e6479b3a..68e6479b3a 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
index 7c2b7843da..7c2b7843da 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 849aa601dd..849aa601dd 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/literal/metrics.json
index 99e1e811f8..99e1e811f8 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
index 6b02871973..6b02871973 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/opacity/metrics.json
index d5ff71d3fb..d5ff71d3fb 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
index a2ce108179..a2ce108179 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/update-feature-state/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/update-feature-state/metrics.json
index 9fa7bcb125..9fa7bcb125 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/update-feature-state/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/update-feature-state/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index d8c1e46044..d8c1e46044 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-pattern/zoomed/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json
index 1d5a43dbb5..1d5a43dbb5 100644
--- a/render-test/metrics/android/render-tests/fill-pattern/zoomed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-sort-key/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
index 19e4444e7b..19e4444e7b 100644
--- a/render-test/metrics/android/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
index e57955c334..e57955c334 100644
--- a/render-test/metrics/android/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
index 99d041ea71..99d041ea71 100644
--- a/render-test/metrics/android/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json
index 0438c21c08..0438c21c08 100644
--- a/render-test/metrics/android/render-tests/fill-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json
index bfdf71e3eb..bfdf71e3eb 100644
--- a/render-test/metrics/android/render-tests/fill-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json
index 6bcf6124c7..6bcf6124c7 100644
--- a/render-test/metrics/android/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json
index 8f91a7313f..8f91a7313f 100644
--- a/render-test/metrics/android/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/fill-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
index 7380dc20f6..7380dc20f6 100644
--- a/render-test/metrics/android/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/filter/equality/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json
index 0a674554cc..0a674554cc 100644
--- a/render-test/metrics/android/render-tests/filter/equality/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json
diff --git a/render-test/metrics/android/render-tests/filter/legacy-equality/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
index fa588a8c1c..fa588a8c1c 100644
--- a/render-test/metrics/android/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
diff --git a/render-test/metrics/android/render-tests/filter/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json
index 9f944d6f8d..9f944d6f8d 100644
--- a/render-test/metrics/android/render-tests/filter/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/clustered-properties/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
index be9fa180b4..be9fa180b4 100644
--- a/render-test/metrics/android/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/clustered/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json
index 1bd8c65442..1bd8c65442 100644
--- a/render-test/metrics/android/render-tests/geojson/clustered/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/external-feature/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json
index fd83a8e503..fd83a8e503 100644
--- a/render-test/metrics/android/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/external-invalid/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
index cd3f6e6da8..cd3f6e6da8 100644
--- a/render-test/metrics/android/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/external-linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
index 10f4e00715..10f4e00715 100644
--- a/render-test/metrics/android/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/external-malformed/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
index 5926c13ff4..5926c13ff4 100644
--- a/render-test/metrics/android/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
index d320f0cacc..d320f0cacc 100644
--- a/render-test/metrics/android/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-feature/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
index 56503db91e..56503db91e 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-invalid/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
index 0066ddda6a..0066ddda6a 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
index e33d3fad02..e33d3fad02 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-linestring-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-fill/metrics.json
index 0f218dcd1d..0f218dcd1d 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-linestring-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
index b36116e2f2..b36116e2f2 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
index 64e5eef6b4..64e5eef6b4 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-malformed/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
index 790feb4254..790feb4254 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-point-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
index a29e53e826..a29e53e826 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-point-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
index 82cfbb293a..82cfbb293a 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-point-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
index 00dd679f94..00dd679f94 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
index b5ceaaeb4b..b5ceaaeb4b 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
index e22e4cbceb..e22e4cbceb 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
index 0740ebff0a..0740ebff0a 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
index 6351096e88..6351096e88 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
index cd64c9258c..cd64c9258c 100644
--- a/render-test/metrics/android/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json
index db190e2032..db190e2032 100644
--- a/render-test/metrics/android/render-tests/geojson/missing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json
diff --git a/render-test/metrics/android/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
index 01aa83fa5a..01aa83fa5a 100644
--- a/render-test/metrics/android/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json
index a35abc3238..a35abc3238 100644
--- a/render-test/metrics/android/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-color/expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
index 14c418ae34..14c418ae34 100644
--- a/render-test/metrics/android/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-intensity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
index bda002d6da..bda002d6da 100644
--- a/render-test/metrics/android/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-intensity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
index d053c111c1..d053c111c1 100644
--- a/render-test/metrics/android/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-intensity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
index b430b22dad..b430b22dad 100644
--- a/render-test/metrics/android/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
index 388260c59a..388260c59a 100644
--- a/render-test/metrics/android/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
index c49688dab4..c49688dab4 100644
--- a/render-test/metrics/android/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
index 60f6b3597e..60f6b3597e 100644
--- a/render-test/metrics/android/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
index 55d223802d..55d223802d 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
index a44d9d543a..a44d9d543a 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
index 6492cdee9c..6492cdee9c 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
index b35ad7efe0..b35ad7efe0 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
index f23c776a09..f23c776a09 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
index e5695503ac..e5695503ac 100644
--- a/render-test/metrics/android/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-weight/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
index f07b481fe5..f07b481fe5 100644
--- a/render-test/metrics/android/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
index a52d17bd4c..a52d17bd4c 100644
--- a/render-test/metrics/android/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/heatmap-weight/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
index c8767ca772..c8767ca772 100644
--- a/render-test/metrics/android/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-accent-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
index a54e339898..a54e339898 100644
--- a/render-test/metrics/android/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
index 381f5a5f3b..381f5a5f3b 100644
--- a/render-test/metrics/android/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0771f6b0be..0771f6b0be 100644
--- a/render-test/metrics/android/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
index b4cfeb242f..b4cfeb242f 100644
--- a/render-test/metrics/android/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
index f6eabf6d7f..f6eabf6d7f 100644
--- a/render-test/metrics/android/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
index b4f720f502..b4f720f502 100644
--- a/render-test/metrics/android/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index 629ff97967..629ff97967 100644
--- a/render-test/metrics/android/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
index 5147ee414f..5147ee414f 100644
--- a/render-test/metrics/android/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
index 0af97a6570..0af97a6570 100644
--- a/render-test/metrics/android/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index cd6e73e57a..cd6e73e57a 100644
--- a/render-test/metrics/android/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
index 6caca4e930..6caca4e930 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
index d72b04d3b8..d72b04d3b8 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
index 4cc3dcf454..4cc3dcf454 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/center/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json
index 67b324681a..67b324681a 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json
index d8f4c42722..d8f4c42722 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json
index ad654a77b5..ad654a77b5 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
index 6033613571..6033613571 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json
index cd53218a9b..cd53218a9b 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/top-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
index 98588b68cb..98588b68cb 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/top-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
index 8a41c6cd33..8a41c6cd33 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-anchor/top/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json
index cb57b99f97..cb57b99f97 100644
--- a/render-test/metrics/android/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json
index 9b5ff8e7ee..9b5ff8e7ee 100644
--- a/render-test/metrics/android/render-tests/icon-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json
index 0ebcd6d911..0ebcd6d911 100644
--- a/render-test/metrics/android/render-tests/icon-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json
index 0442193f62..0442193f62 100644
--- a/render-test/metrics/android/render-tests/icon-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json
index f557f2f376..f557f2f376 100644
--- a/render-test/metrics/android/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
index 7869404ab6..7869404ab6 100644
--- a/render-test/metrics/android/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
index 582926c010..582926c010 100644
--- a/render-test/metrics/android/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
index 938faa8d5d..938faa8d5d 100644
--- a/render-test/metrics/android/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
index 9e34cb3c31..9e34cb3c31 100644
--- a/render-test/metrics/android/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
index a012902f8c..a012902f8c 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
index 352ccd5d8d..352ccd5d8d 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
index e915154ddd..e915154ddd 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/multiply/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
index e19c3f8190..e19c3f8190 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
index 253c475fa6..253c475fa6 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
index a4e1d32105..a4e1d32105 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-color/transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
index e1b6fdea37..e1b6fdea37 100644
--- a/render-test/metrics/android/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
index b758a15cb0..b758a15cb0 100644
--- a/render-test/metrics/android/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
index 1da08527aa..1da08527aa 100644
--- a/render-test/metrics/android/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
index 98fee058ae..98fee058ae 100644
--- a/render-test/metrics/android/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-halo-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
index d2eb42c450..d2eb42c450 100644
--- a/render-test/metrics/android/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index 296b1ab761..296b1ab761 100644
--- a/render-test/metrics/android/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-image/image-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
index 53889c4c1e..53889c4c1e 100644
--- a/render-test/metrics/android/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-image/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json
index edfd2b14f0..edfd2b14f0 100644
--- a/render-test/metrics/android/render-tests/icon-image/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-image/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json
index 4e30239263..4e30239263 100644
--- a/render-test/metrics/android/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-image/token/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json
index 54cb2c0a34..54cb2c0a34 100644
--- a/render-test/metrics/android/render-tests/icon-image/token/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
index 34ec7763c0..34ec7763c0 100644
--- a/render-test/metrics/android/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json
index 0c67347960..0c67347960 100644
--- a/render-test/metrics/android/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
index acb58f3c15..acb58f3c15 100644
--- a/render-test/metrics/android/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
index ca735117c2..ca735117c2 100644
--- a/render-test/metrics/android/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json
index 3f16a5db7e..3f16a5db7e 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json
index 7ba1b61538..7ba1b61538 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/icon-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
index 40bfec6c2b..40bfec6c2b 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
index e015e81944..e015e81944 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
index fe5fadef53..fe5fadef53 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
index c9966a9709..c9966a9709 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-opacity/text-only/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
index 547782edbf..547782edbf 100644
--- a/render-test/metrics/android/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index 89400e907b..89400e907b 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index bc307b0d2e..bc307b0d2e 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index cfcf1318a6..cfcf1318a6 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index bd55b20005..bd55b20005 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 4ac7df3bd3..4ac7df3bd3 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index f43ae37801..f43ae37801 100644
--- a/render-test/metrics/android/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
index 18302a931c..18302a931c 100644
--- a/render-test/metrics/android/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
index fe8ef397b5..fe8ef397b5 100644
--- a/render-test/metrics/android/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotate/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
index 737ec7c5e4..737ec7c5e4 100644
--- a/render-test/metrics/android/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotate/with-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
index 7cfdad8ce5..7cfdad8ce5 100644
--- a/render-test/metrics/android/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index 60d8882306..60d8882306 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index 308bd9ec48..308bd9ec48 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index 9ad7a5a777..9ad7a5a777 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index 54540f1523..54540f1523 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index c93c29caba..c93c29caba 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index ef16a3be15..ef16a3be15 100644
--- a/render-test/metrics/android/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index 5a476b3ceb..5a476b3ceb 100644
--- a/render-test/metrics/android/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index bae91c9e1e..bae91c9e1e 100644
--- a/render-test/metrics/android/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
index f3b9fd991a..f3b9fd991a 100644
--- a/render-test/metrics/android/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
index 0082265bc2..0082265bc2 100644
--- a/render-test/metrics/android/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
index ab4066401f..ab4066401f 100644
--- a/render-test/metrics/android/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
index 35949d875b..35949d875b 100644
--- a/render-test/metrics/android/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json
index 32c0d65663..32c0d65663 100644
--- a/render-test/metrics/android/render-tests/icon-size/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json
index 898ae76855..898ae76855 100644
--- a/render-test/metrics/android/render-tests/icon-size/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json
index 5fd11febd9..5fd11febd9 100644
--- a/render-test/metrics/android/render-tests/icon-size/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/property-function-plain/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
index 29bb6885a6..29bb6885a6 100644
--- a/render-test/metrics/android/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
index 1933c2bd79..1933c2bd79 100644
--- a/render-test/metrics/android/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index c35d29a4bc..c35d29a4bc 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 234a97fb40..234a97fb40 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
index 0e2d9a2cac..0e2d9a2cac 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
index 9a06c56b18..9a06c56b18 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 5bf954ef9a..5bf954ef9a 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index 19016e2ca3..19016e2ca3 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index d77747616a..d77747616a 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index 57b34d1fe6..57b34d1fe6 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fadbfd3946..fadbfd3946 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/both/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
index fdc5409389..fdc5409389 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index 6cd3b57e77..6cd3b57e77 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
index 7c20a76e9f..7c20a76e9f 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
index 132e902e02..132e902e02 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
index 6f020e1b52..6f020e1b52 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
index e16f9df5cf..e16f9df5cf 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index 7c8fd257be..7c8fd257be 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
index 96c45de296..96c45de296 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/height/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
index 2824e6f31f..2824e6f31f 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
index 379a893148..379a893148 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
index d60b808d52..d60b808d52 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/text-variable-anchor-overlap/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor-overlap/metrics.json
index 824020ad64..824020ad64 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/text-variable-anchor-overlap/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor-overlap/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 2518612836..2518612836 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
index f0aa12451e..f0aa12451e 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index 8dafe406e3..8dafe406e3 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
index a73c19f1a1..a73c19f1a1 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-text-fit/width/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
index 30f72209ba..30f72209ba 100644
--- a/render-test/metrics/android/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
index 3cab470350..3cab470350 100644
--- a/render-test/metrics/android/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
index c943965ae3..c943965ae3 100644
--- a/render-test/metrics/android/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json
index 5f546ed519..5f546ed519 100644
--- a/render-test/metrics/android/render-tests/icon-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json
index 07ec462e3e..07ec462e3e 100644
--- a/render-test/metrics/android/render-tests/icon-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json
index 2484b54600..2484b54600 100644
--- a/render-test/metrics/android/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json
index 3b32ea46ea..3b32ea46ea 100644
--- a/render-test/metrics/android/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/icon-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
index a7e42c0054..a7e42c0054 100644
--- a/render-test/metrics/android/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json
index 0778f614a5..0778f614a5 100644
--- a/render-test/metrics/android/render-tests/image/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json
index ac35086e5a..ac35086e5a 100644
--- a/render-test/metrics/android/render-tests/image/pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-brightness/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json
index 1cf4420db4..1cf4420db4 100644
--- a/render-test/metrics/android/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-contrast/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json
index 2bc5a67c41..2bc5a67c41 100644
--- a/render-test/metrics/android/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-hue-rotate/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
index 91eddc25be..91eddc25be 100644
--- a/render-test/metrics/android/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json
index 4502760da8..4502760da8 100644
--- a/render-test/metrics/android/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-resampling/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json
index 4de07d463c..4de07d463c 100644
--- a/render-test/metrics/android/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-saturation/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json
index d9a7ee52dc..d9a7ee52dc 100644
--- a/render-test/metrics/android/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json
diff --git a/render-test/metrics/android/render-tests/image/raster-visibility/metrics.json b/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json
index e865354a03..e865354a03 100644
--- a/render-test/metrics/android/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json
diff --git a/render-test/metrics/android/render-tests/is-supported-script/filter/metrics.json b/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
index 21dccc8b3d..21dccc8b3d 100644
--- a/render-test/metrics/android/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
diff --git a/render-test/metrics/android/render-tests/is-supported-script/layout/metrics.json b/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
index d3e19b7fc4..d3e19b7fc4 100644
--- a/render-test/metrics/android/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json
index 16cd14b395..16cd14b395 100644
--- a/render-test/metrics/android/render-tests/line-blur/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json
index 3fa35f8b5d..3fa35f8b5d 100644
--- a/render-test/metrics/android/render-tests/line-blur/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json
index b47c70a7f3..b47c70a7f3 100644
--- a/render-test/metrics/android/render-tests/line-blur/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json
index 4b1d037fd4..4b1d037fd4 100644
--- a/render-test/metrics/android/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-cap/butt/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json
index 2c32d4a3e5..2c32d4a3e5 100644
--- a/render-test/metrics/android/render-tests/line-cap/butt/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-cap/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json
index eb74957cda..eb74957cda 100644
--- a/render-test/metrics/android/render-tests/line-cap/round/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-cap/square/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json
index 51a9770d07..51a9770d07 100644
--- a/render-test/metrics/android/render-tests/line-cap/square/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json
index 717e2eb564..717e2eb564 100644
--- a/render-test/metrics/android/render-tests/line-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json
index 8e6389eb46..8e6389eb46 100644
--- a/render-test/metrics/android/render-tests/line-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json
index ddaa8f0266..ddaa8f0266 100644
--- a/render-test/metrics/android/render-tests/line-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-color/property-function-identity/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
index 01f0cfb0d7..01f0cfb0d7 100644
--- a/render-test/metrics/android/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json
index 599962640a..599962640a 100644
--- a/render-test/metrics/android/render-tests/line-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json
index c6407ecefd..c6407ecefd 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
index b1d0fef10e..b1d0fef10e 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index cedf04b2b2..cedf04b2b2 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
index 55781bd6dc..55781bd6dc 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 686aab9a19..686aab9a19 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 8b5babc4d6..8b5babc4d6 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 3656fd50b9..3656fd50b9 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index e1f92ff8c7..e1f92ff8c7 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index 7659a392c1..7659a392c1 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/long-segment/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
index 5573019198..5573019198 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
index bb7eba4da3..bb7eba4da3 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/round/segments/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/slant/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
index 4a37057ea0..4a37057ea0 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
index b5dbdf01f4..b5dbdf01f4 100644
--- a/render-test/metrics/android/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gap-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json
index 0e363e5032..0e363e5032 100644
--- a/render-test/metrics/android/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gap-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json
index e64b9078bd..e64b9078bd 100644
--- a/render-test/metrics/android/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gap-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
index b0b7ae31a9..b0b7ae31a9 100644
--- a/render-test/metrics/android/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gap-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
index 8cd42ddcc4..8cd42ddcc4 100644
--- a/render-test/metrics/android/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gradient/gradient/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
index 949d5baa3f..949d5baa3f 100644
--- a/render-test/metrics/android/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-gradient/translucent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
index 09794bc848..09794bc848 100644
--- a/render-test/metrics/android/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/bevel-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
index 858332e601..858332e601 100644
--- a/render-test/metrics/android/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/bevel/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json
index 2543b29790..2543b29790 100644
--- a/render-test/metrics/android/render-tests/line-join/bevel/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json
index dfccaa2f70..dfccaa2f70 100644
--- a/render-test/metrics/android/render-tests/line-join/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/miter-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
index 9755dd38bb..9755dd38bb 100644
--- a/render-test/metrics/android/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/miter/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json
index ad4fe40ff1..ad4fe40ff1 100644
--- a/render-test/metrics/android/render-tests/line-join/miter/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
index 19d1bd2d4d..19d1bd2d4d 100644
--- a/render-test/metrics/android/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json
index 22cca73e28..22cca73e28 100644
--- a/render-test/metrics/android/render-tests/line-join/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/round-transparent/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
index 637da13e2a..637da13e2a 100644
--- a/render-test/metrics/android/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-join/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json
index fedaab7cda..fedaab7cda 100644
--- a/render-test/metrics/android/render-tests/line-join/round/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-offset/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json
index fa911b308b..fa911b308b 100644
--- a/render-test/metrics/android/render-tests/line-offset/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-offset/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json
index 3975a9fb8c..3975a9fb8c 100644
--- a/render-test/metrics/android/render-tests/line-offset/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-offset/literal-negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
index c0f0dbaca0..c0f0dbaca0 100644
--- a/render-test/metrics/android/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json
index 654243139f..654243139f 100644
--- a/render-test/metrics/android/render-tests/line-offset/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json
index 9f5aeec94e..9f5aeec94e 100644
--- a/render-test/metrics/android/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json
index bfecdbdf82..bfecdbdf82 100644
--- a/render-test/metrics/android/render-tests/line-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json
index 57ba8691bb..57ba8691bb 100644
--- a/render-test/metrics/android/render-tests/line-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json
index 2c63315778..2c63315778 100644
--- a/render-test/metrics/android/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
index 89375740df..89375740df 100644
--- a/render-test/metrics/android/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-opacity/step-curve/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
index 9c41387d39..9c41387d39 100644
--- a/render-test/metrics/android/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/@2x/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
index 013d6c4474..013d6c4474 100644
--- a/render-test/metrics/android/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json
index d131b2ec53..d131b2ec53 100644
--- a/render-test/metrics/android/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/opacity/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/opacity/metrics.json
index da7b22fe49..da7b22fe49 100644
--- a/render-test/metrics/android/render-tests/line-pattern/opacity/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/opacity/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/overscaled/metrics.json
index 58f75b5765..58f75b5765 100644
--- a/render-test/metrics/android/render-tests/line-pattern/overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/pitch/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
index f5cf1350c0..f5cf1350c0 100644
--- a/render-test/metrics/android/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
index c98e3ac4aa..c98e3ac4aa 100644
--- a/render-test/metrics/android/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/step-curve/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
index 434924e7bd..434924e7bd 100644
--- a/render-test/metrics/android/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
index 9c3d98a93b..9c3d98a93b 100644
--- a/render-test/metrics/android/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pitch/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json
index e724fb576e..e724fb576e 100644
--- a/render-test/metrics/android/render-tests/line-pitch/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pitch/pitch0/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
index b386be06d1..b386be06d1 100644
--- a/render-test/metrics/android/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pitch/pitch15/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
index bdbfb86129..bdbfb86129 100644
--- a/render-test/metrics/android/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pitch/pitch30/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
index 3f83797ec1..3f83797ec1 100644
--- a/render-test/metrics/android/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
index cf2850eb17..cf2850eb17 100644
--- a/render-test/metrics/android/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-sort-key/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
index a5af2bda0e..a5af2bda0e 100644
--- a/render-test/metrics/android/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
index 1f1b6a55af..1f1b6a55af 100644
--- a/render-test/metrics/android/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
index cc2573a1c5..cc2573a1c5 100644
--- a/render-test/metrics/android/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json
index 917e026a4d..917e026a4d 100644
--- a/render-test/metrics/android/render-tests/line-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json
index 0aaee48cc1..0aaee48cc1 100644
--- a/render-test/metrics/android/render-tests/line-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-translate/literal/metrics.json
index 12be45df0b..12be45df0b 100644
--- a/render-test/metrics/android/render-tests/line-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-triangulation/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json
index f58274cb47..f58274cb47 100644
--- a/render-test/metrics/android/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-triangulation/round/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json
index 3adcbaf3db..3adcbaf3db 100644
--- a/render-test/metrics/android/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json
index 2da42021f5..2da42021f5 100644
--- a/render-test/metrics/android/render-tests/line-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json
index 0db8589365..0db8589365 100644
--- a/render-test/metrics/android/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json
index 8da174da60..8da174da60 100644
--- a/render-test/metrics/android/render-tests/line-width/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json
index e63e90a502..e63e90a502 100644
--- a/render-test/metrics/android/render-tests/line-width/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json
index 084eadf780..084eadf780 100644
--- a/render-test/metrics/android/render-tests/line-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json
index 79d772b2fc..79d772b2fc 100644
--- a/render-test/metrics/android/render-tests/line-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/very-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
index 870bafdcc2..870bafdcc2 100644
--- a/render-test/metrics/android/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/zero-width-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
index 518dc9177b..518dc9177b 100644
--- a/render-test/metrics/android/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/line-width/zero-width/metrics.json b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json
index a6ae246f58..a6ae246f58 100644
--- a/render-test/metrics/android/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json
diff --git a/render-test/metrics/android/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
index 85488bcd72..85488bcd72 100644
--- a/render-test/metrics/android/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/map-mode/static/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json
index fd60fa45d9..fd60fa45d9 100644
--- a/render-test/metrics/android/render-tests/map-mode/static/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json
diff --git a/render-test/metrics/android/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
index a18d8428f1..a18d8428f1 100644
--- a/render-test/metrics/android/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/render-test/metrics/android/render-tests/map-mode/tile/metrics.json b/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json
index 58d33fabc5..58d33fabc5 100644
--- a/render-test/metrics/android/render-tests/map-mode/tile/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json
diff --git a/render-test/metrics/android/render-tests/mixed-zoom/z10-z11/metrics.json b/metrics/next-android-render-test-runner/render-tests/mixed-zoom/z10-z11/metrics.json
index 755399a3d6..755399a3d6 100644
--- a/render-test/metrics/android/render-tests/mixed-zoom/z10-z11/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/mixed-zoom/z10-z11/metrics.json
diff --git a/render-test/metrics/android/render-tests/projection/axonometric-multiple/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
index 35746bedf0..35746bedf0 100644
--- a/render-test/metrics/android/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/render-test/metrics/android/render-tests/projection/axonometric/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json
index 37f074d4b5..37f074d4b5 100644
--- a/render-test/metrics/android/render-tests/projection/axonometric/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json
diff --git a/render-test/metrics/android/render-tests/projection/perspective/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json
index ae487a2770..ae487a2770 100644
--- a/render-test/metrics/android/render-tests/projection/perspective/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json
diff --git a/render-test/metrics/android/render-tests/projection/skew/metrics.json b/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json
index 3cdc0996b6..3cdc0996b6 100644
--- a/render-test/metrics/android/render-tests/projection/skew/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-alpha/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json
index 0c8c5ae5ee..0c8c5ae5ee 100644
--- a/render-test/metrics/android/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-brightness/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json
index de1cad81b4..de1cad81b4 100644
--- a/render-test/metrics/android/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-brightness/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json
index 653a891058..653a891058 100644
--- a/render-test/metrics/android/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-brightness/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
index 2a54a2ef6d..2a54a2ef6d 100644
--- a/render-test/metrics/android/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-contrast/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json
index bec0bbde97..bec0bbde97 100644
--- a/render-test/metrics/android/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-contrast/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json
index 749c38ae2d..749c38ae2d 100644
--- a/render-test/metrics/android/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-contrast/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
index ecce567994..ecce567994 100644
--- a/render-test/metrics/android/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-extent/maxzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
index 0466841279..0466841279 100644
--- a/render-test/metrics/android/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-extent/minzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
index c92eccce03..c92eccce03 100644
--- a/render-test/metrics/android/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-hue-rotate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
index aff8841b6d..aff8841b6d 100644
--- a/render-test/metrics/android/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-hue-rotate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
index 7cc4cf08ea..7cc4cf08ea 100644
--- a/render-test/metrics/android/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
index 28e94aefb7..28e94aefb7 100644
--- a/render-test/metrics/android/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-loading/missing/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json
index 8c00dacf35..8c00dacf35 100644
--- a/render-test/metrics/android/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-masking/overlapping-zoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-zoom/metrics.json
index c112d14d4a..c112d14d4a 100644
--- a/render-test/metrics/android/render-tests/raster-masking/overlapping-zoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-zoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-masking/overlapping/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
index 4298bd0717..4298bd0717 100644
--- a/render-test/metrics/android/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json
index 41eef5e21b..41eef5e21b 100644
--- a/render-test/metrics/android/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json
index f92a659dba..f92a659dba 100644
--- a/render-test/metrics/android/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
index b45afd3742..b45afd3742 100644
--- a/render-test/metrics/android/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-resampling/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json
index 557977f6a5..557977f6a5 100644
--- a/render-test/metrics/android/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-resampling/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json
index 7c734a0a50..7c734a0a50 100644
--- a/render-test/metrics/android/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-resampling/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
index 7ec4f4ae01..7ec4f4ae01 100644
--- a/render-test/metrics/android/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-rotation/0/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json
index fa0bbd1938..fa0bbd1938 100644
--- a/render-test/metrics/android/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-rotation/180/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json
index 031b232a91..031b232a91 100644
--- a/render-test/metrics/android/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-rotation/270/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json
index f8becd36bb..f8becd36bb 100644
--- a/render-test/metrics/android/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-rotation/45/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json
index ed84e1a55e..ed84e1a55e 100644
--- a/render-test/metrics/android/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-rotation/90/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json
index 46be519fbc..46be519fbc 100644
--- a/render-test/metrics/android/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-saturation/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json
index 9572e6c6c9..9572e6c6c9 100644
--- a/render-test/metrics/android/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-saturation/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json
index 784e56605d..784e56605d 100644
--- a/render-test/metrics/android/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-saturation/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
index ffd98eead5..ffd98eead5 100644
--- a/render-test/metrics/android/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json
index e2ace3a76c..e2ace3a76c 100644
--- a/render-test/metrics/android/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/raster-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
index ea4a4991e2..ea4a4991e2 100644
--- a/render-test/metrics/android/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/bangkok/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/bangkok/metrics.json
index 60534008b5..60534008b5 100644
--- a/render-test/metrics/android/render-tests/real-world/bangkok/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/bangkok/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/chicago/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/chicago/metrics.json
index 073c559838..073c559838 100644
--- a/render-test/metrics/android/render-tests/real-world/chicago/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/chicago/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/nepal/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json
index 7755a9b783..7755a9b783 100644
--- a/render-test/metrics/android/render-tests/real-world/nepal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/norway/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json
index 88dd58213f..88dd58213f 100644
--- a/render-test/metrics/android/render-tests/real-world/norway/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/sanfrancisco/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/sanfrancisco/metrics.json
index ac37b700d2..ac37b700d2 100644
--- a/render-test/metrics/android/render-tests/real-world/sanfrancisco/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/sanfrancisco/metrics.json
diff --git a/render-test/metrics/android/render-tests/real-world/uruguay/metrics.json b/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json
index b9e297c9c9..b9e297c9c9 100644
--- a/render-test/metrics/android/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
index bff4545811..bff4545811 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2467/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2467/metrics.json
index f41bf56de9..f41bf56de9 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2467/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2467/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index 4d431c08e6..4d431c08e6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index 32d5456b23..32d5456b23 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index f87cb307bc..f87cb307bc 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2762/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2762/metrics.json
index f3926bbeba..f3926bbeba 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2762/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2762/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2769/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2769/metrics.json
index 53d895810b..53d895810b 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2769/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2769/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 9b9600bfa9..9b9600bfa9 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 208df1f9aa..208df1f9aa 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index c32421f115..c32421f115 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index aafc946d4a..aafc946d4a 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index 851f7e3b34..851f7e3b34 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index 74b2b19dcb..74b2b19dcb 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 5f938ae6d1..5f938ae6d1 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index c22cbf02c0..c22cbf02c0 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index 5f1797de53..5f1797de53 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 87a9854cc5..87a9854cc5 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 0e7383ca6a..0e7383ca6a 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 01a7f5db23..01a7f5db23 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index d90714613f..d90714613f 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index 88ca96eeea..88ca96eeea 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 11ade0d587..11ade0d587 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 6fc89ff533..6fc89ff533 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index fd89e1800b..fd89e1800b 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 8e86323313..8e86323313 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ef5c10bea3..ef5c10bea3 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index 87040b0470..87040b0470 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index ec7d95f6af..ec7d95f6af 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index a56b2e548c..a56b2e548c 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index a7e56a9f7d..a7e56a9f7d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index 8854daf33d..8854daf33d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index f39863da6d..f39863da6d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 0f7cd1088c..0f7cd1088c 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index 712f8661f3..712f8661f3 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index a82a9adf50..a82a9adf50 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index 4d952f7c12..4d952f7c12 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 3ec353fca6..3ec353fca6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 88e9533c52..88e9533c52 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index cddebe5c98..cddebe5c98 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 8965b40f22..8965b40f22 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 4b1c5ed4d1..4b1c5ed4d1 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index 90a6d24ccf..90a6d24ccf 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index d13b721423..d13b721423 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 8812e04248..8812e04248 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index 60162e3d40..60162e3d40 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index 2f9c7a6534..2f9c7a6534 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 3fabd70550..3fabd70550 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index 98e7a428b5..98e7a428b5 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index aa52fa340e..aa52fa340e 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 2c71a8276e..2c71a8276e 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index c447f393e3..c447f393e3 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 356454f1cd..356454f1cd 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 2412652a9c..2412652a9c 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5642/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5642/metrics.json
index ca96f44a4d..ca96f44a4d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5642/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5642/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5740/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5740/metrics.json
index b893510e29..b893510e29 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5740/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5740/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 4f559e0cca..4f559e0cca 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 34102c9c67..34102c9c67 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
index 8c3472f9aa..8c3472f9aa 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index da8e83c5f6..da8e83c5f6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index f38256cc80..f38256cc80 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index adc05b3b21..adc05b3b21 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5982/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5982/metrics.json
index d16fcc7081..d16fcc7081 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#5982/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5982/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index 92abeb1bdd..92abeb1bdd 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 29231d75a8..29231d75a8 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 449cd5a80e..449cd5a80e 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 5e10e448d0..5e10e448d0 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index ea408c531e..ea408c531e 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6706/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6706/metrics.json
index 33f26580c9..33f26580c9 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6706/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6706/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6806/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6806/metrics.json
index 3e6cf9a38d..3e6cf9a38d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6806/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6806/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index daa6eaf922..daa6eaf922 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index a01f4d3220..a01f4d3220 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7066/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7066/metrics.json
index 857769e47a..857769e47a 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7066/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7066/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 4734073a69..4734073a69 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7271/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7271/metrics.json
index dfe0aa9e55..dfe0aa9e55 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#7271/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7271/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 0a59fd1d86..0a59fd1d86 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
new file mode 100644
index 0000000000..a5407ceb76
--- /dev/null
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            8,
+            9,
+            13,
+            1,
+            [
+                131072,
+                131072
+            ],
+            [
+                214,
+                214
+            ],
+            [
+                384,
+                384
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index b080ab26db..b080ab26db 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index ac3d550452..ac3d550452 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index b47b4ff33d..b47b4ff33d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 096c8c728b..096c8c728b 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index da70af57a2..da70af57a2 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index f6086a39d0..f6086a39d0 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 8da842e4b2..8da842e4b2 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index 28befe795d..28befe795d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index 4b6b4ca72d..4b6b4ca72d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index 6031d6707d..6031d6707d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index d504e8dfcb..d504e8dfcb 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index 0713acaff6..0713acaff6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index e692fac550..e692fac550 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index badbad77f6..badbad77f6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 9748759fbc..9748759fbc 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7357/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7357/metrics.json
index e0f60dc866..e0f60dc866 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7357/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7357/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index e3dda23626..e3dda23626 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index ea3be47a33..ea3be47a33 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 7106729433..7106729433 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index c9fd2cb7dc..c9fd2cb7dc 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index 2d5ddf012c..2d5ddf012c 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index 05d12a45f4..05d12a45f4 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 3b899bdf3b..3b899bdf3b 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index b8b0444791..b8b0444791 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 0c015edbb6..0c015edbb6 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 0cbf617094..0cbf617094 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index d765047e8d..d765047e8d 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 4a07197ca8..4a07197ca8 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 0ac9a480e8..0ac9a480e8 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9976/metrics.json
index 01461ee3f7..01461ee3f7 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9976/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9976/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index e0ba2d7e56..e0ba2d7e56 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/render-test/metrics/android/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index 89a9de673e..89a9de673e 100644
--- a/render-test/metrics/android/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/render-test/metrics/android/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
index 0fe746ef17..0fe746ef17 100644
--- a/render-test/metrics/android/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
index 50a992d593..50a992d593 100644
--- a/render-test/metrics/android/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
index 0aba40cd86..0aba40cd86 100644
--- a/render-test/metrics/android/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/render-test/metrics/android/render-tests/retina-raster/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json
index 01f840c5fd..01f840c5fd 100644
--- a/render-test/metrics/android/render-tests/retina-raster/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
index bcfa40c78c..bcfa40c78c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
index 272e8076be..272e8076be 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
index 603c0d6ed2..603c0d6ed2 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
index 6f56321555..6f56321555 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
index 8410a3690e..8410a3690e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
index f1d4251bb3..f1d4251bb3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 3af9902282..3af9902282 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 240c61b52c..240c61b52c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 3c320d3773..3c320d3773 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index cf0c0c4fc4..cf0c0c4fc4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index 7e8b977de2..7e8b977de2 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index 35d925fbe4..35d925fbe4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
index cdbefe037b..cdbefe037b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 4061fcf217..4061fcf217 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-pattern/metrics.json
index 0814f7c2e4..0814f7c2e4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
index 05e9091992..05e9091992 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-remove/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
index c4d8c8d0cf..c4d8c8d0cf 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
index c4bfc9455a..c4bfc9455a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-pattern/metrics.json
index 68f2fdddb0..68f2fdddb0 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/image-update-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
index bd9f962643..bd9f962643 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
index 89f56551d7..89f56551d7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
index 409866b840..409866b840 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
index 83a9b25e18..83a9b25e18 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
index d88a2f2edf..d88a2f2edf 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fc390436b7..fc390436b7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
index c643ef18ca..c643ef18ca 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 9a214a0953..9a214a0953 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 517ebe071c..517ebe071c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
index 3ff10b270a..3ff10b270a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 64e99a2c82..64e99a2c82 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index fb925b347b..fb925b347b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index a82d85cb99..a82d85cb99 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 76fec9fc12..76fec9fc12 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 4bf530c169..4bf530c169 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index 22e34e0451..22e34e0451 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index 11c62ba455..11c62ba455 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index e862d079d9..e862d079d9 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 857220d1a3..857220d1a3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 25f0625198..25f0625198 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index 569d90c45a..569d90c45a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index 75b9be2695..75b9be2695 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index ec06e178e4..ec06e178e4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index 7ac09cf4f0..7ac09cf4f0 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 62b6ed9eb9..62b6ed9eb9 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 2fd979a321..2fd979a321 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index de4cd2971b..de4cd2971b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index a49a0b4233..a49a0b4233 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 958fa32aca..958fa32aca 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 2bd9af029c..2bd9af029c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index a735c51f2f..a735c51f2f 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 29f8b96205..29f8b96205 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 1d28535968..1d28535968 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index 032f7f7a4a..032f7f7a4a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 8297e79637..8297e79637 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index a1fdad6adf..a1fdad6adf 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index f600fbfbac..f600fbfbac 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 1e1edc57f7..1e1edc57f7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index a2de32a964..a2de32a964 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index d09b918710..d09b918710 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index 6111ef7d1c..6111ef7d1c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 8a7375fdff..8a7375fdff 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index e2fca0ddf3..e2fca0ddf3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index b08491f74d..b08491f74d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2e85c9bd3e..2e85c9bd3e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 5fda2b090f..5fda2b090f 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 306f22e7e0..306f22e7e0 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 0501033e47..0501033e47 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 16d480a300..16d480a300 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 521d382c76..521d382c76 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index 0503e941c7..0503e941c7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index 4f8952c841..4f8952c841 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 5cae99b8ec..5cae99b8ec 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 08d42e9d33..08d42e9d33 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index dcebe280f1..dcebe280f1 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index 0f8050b055..0f8050b055 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index 2f4f517593..2f4f517593 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index 914982908f..914982908f 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index 1edeb7ef2d..1edeb7ef2d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index 63b273884c..63b273884c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index 037d52d3f3..037d52d3f3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index eff85ebbda..eff85ebbda 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 8a75e9ff52..8a75e9ff52 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index ebab52d702..ebab52d702 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 666af39f00..666af39f00 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index c80bdb1ea7..c80bdb1ea7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index 610b1508c8..610b1508c8 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index f669952599..f669952599 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index fda3bec41d..fda3bec41d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index f11fefa85a..f11fefa85a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 587ae888b0..587ae888b0 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 86e6ae6616..86e6ae6616 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index cd705af92c..cd705af92c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index 3ab83383fb..3ab83383fb 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index f8d1119365..f8d1119365 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index dc8de2ff32..dc8de2ff32 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7a820d6fb7..7a820d6fb7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
index a5e115b9b4..a5e115b9b4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index a690d3b609..a690d3b609 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 225e9ac738..225e9ac738 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index feacc97ca3..feacc97ca3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index 52dc5c2302..52dc5c2302 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 8fd3e968d7..8fd3e968d7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index 966bcf96f4..966bcf96f4 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index 19bdaf7077..19bdaf7077 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index 93ebd2d12f..93ebd2d12f 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 7eabda157e..7eabda157e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index ea06f2c218..ea06f2c218 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index c3a9db4d3e..c3a9db4d3e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 860a6d03ef..860a6d03ef 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 15f1439147..15f1439147 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index a14498b106..a14498b106 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index 9c0e4b644a..9c0e4b644a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index 879de5d213..879de5d213 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index 6110106f01..6110106f01 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 0628ab8e7b..0628ab8e7b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 8ceecb5854..8ceecb5854 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index 748840137d..748840137d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index bd89559a6b..bd89559a6b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index de95bd93b8..de95bd93b8 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 692bc0c697..692bc0c697 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 25dda0a1cd..25dda0a1cd 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fce35ee7c3..fce35ee7c3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index dec1db7ef6..dec1db7ef6 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 218e279aef..218e279aef 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index cb404f9c62..cb404f9c62 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 5b8fe64b63..5b8fe64b63 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 7572842ff0..7572842ff0 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 024ad70b9a..024ad70b9a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index a3d0fb2f55..a3d0fb2f55 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7f7df8a0ac..7f7df8a0ac 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index 54db2f504d..54db2f504d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 881bc0c5d9..881bc0c5d9 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index 7b6c749048..7b6c749048 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index a8262734f6..a8262734f6 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index e36df2ffea..e36df2ffea 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index b659b0ef54..b659b0ef54 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 2e56667962..2e56667962 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index fde68418ca..fde68418ca 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 0782565c46..0782565c46 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 93f764e760..93f764e760 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index 9192946013..9192946013 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index 81267d8fe6..81267d8fe6 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index 9e1002b65c..9e1002b65c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index 16af8b98f2..16af8b98f2 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index 5b110f23b8..5b110f23b8 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index abd3042ca1..abd3042ca1 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 91277db837..91277db837 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index b3010ed76a..b3010ed76a 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index ba11ae8974..ba11ae8974 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index db42d8d98e..db42d8d98e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 15d2bce417..15d2bce417 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 9d96a59378..9d96a59378 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 9326dc0e94..9326dc0e94 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 6ae1be4054..6ae1be4054 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 2fa3eb2c6e..2fa3eb2c6e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index ea8c6c389e..ea8c6c389e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
index 3ecba765be..3ecba765be 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
index c6ccbd51f9..c6ccbd51f9 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index f7c8d7fb6e..f7c8d7fb6e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index a31a70a0bd..a31a70a0bd 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 7ef3c45abc..7ef3c45abc 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 7fb97fa8c1..7fb97fa8c1 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 492d70784c..492d70784c 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index a260d4b3a7..a260d4b3a7 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index a0767a8417..a0767a8417 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index de4fc72eae..de4fc72eae 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 944fe88b0e..944fe88b0e 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 501be0faa3..501be0faa3 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 197539ed80..197539ed80 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
index b70b5b810d..b70b5b810d 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index dc0a725f12..dc0a725f12 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 5e57b1eae6..5e57b1eae6 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 45a5f8112b..45a5f8112b 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 7702ecc102..7702ecc102 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 140e5f0917..140e5f0917 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/render-test/metrics/android/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index d7e3053256..d7e3053256 100644
--- a/render-test/metrics/android/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/render-test/metrics/android/render-tests/satellite-v9/z0/metrics.json b/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
index 86ed52e33c..86ed52e33c 100644
--- a/render-test/metrics/android/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
diff --git a/render-test/metrics/android/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
index 7953300024..7953300024 100644
--- a/render-test/metrics/android/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
index d532760f10..d532760f10 100644
--- a/render-test/metrics/android/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index d6c7d1dc2d..d6c7d1dc2d 100644
--- a/render-test/metrics/android/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
index 3ccd77e89e..3ccd77e89e 100644
--- a/render-test/metrics/android/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index b1c2a85525..b1c2a85525 100644
--- a/render-test/metrics/android/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 485f9f13e9..485f9f13e9 100644
--- a/render-test/metrics/android/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 188bb44091..188bb44091 100644
--- a/render-test/metrics/android/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e2b23c569c..e2b23c569c 100644
--- a/render-test/metrics/android/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/render-test/metrics/android/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index 13e176884d..13e176884d 100644
--- a/render-test/metrics/android/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-cross-fade/chinese/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-cross-fade/chinese/metrics.json
index f0b4f7f4d5..f0b4f7f4d5 100644
--- a/render-test/metrics/android/render-tests/symbol-cross-fade/chinese/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-cross-fade/chinese/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/linestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
index cd6a57c7e9..cd6a57c7e9 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
index 851af9c007..851af9c007 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
index b0484a0a28..b0484a0a28 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
index dcad60ddc9..dcad60ddc9 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
index fce099664e..fce099664e 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-geometry/polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
index 0badbe769f..0badbe769f 100644
--- a/render-test/metrics/android/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
index 6508cd45d3..6508cd45d3 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/line-center/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
index ab9871b3c7..ab9871b3c7 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
index 514417f076..514417f076 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/line/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json
index 7a9e8bdcaa..7a9e8bdcaa 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
index eefa720be1..eefa720be1 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-placement/point/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json
index 761979fe7c..761979fe7c 100644
--- a/render-test/metrics/android/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
index 040e7e445b..040e7e445b 100644
--- a/render-test/metrics/android/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
index 01436c9091..01436c9091 100644
--- a/render-test/metrics/android/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index 0a53ed7c7a..0a53ed7c7a 100644
--- a/render-test/metrics/android/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
index 899b0ba39d..899b0ba39d 100644
--- a/render-test/metrics/android/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-spacing/line-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
index 3ccf570225..3ccf570225 100644
--- a/render-test/metrics/android/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-spacing/line-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
index 764a7db8ef..764a7db8ef 100644
--- a/render-test/metrics/android/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
index f800ba7f81..f800ba7f81 100644
--- a/render-test/metrics/android/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-spacing/point-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
index 14d465b9f6..14d465b9f6 100644
--- a/render-test/metrics/android/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-spacing/point-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
index f4063040e5..f4063040e5 100644
--- a/render-test/metrics/android/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
index c3b485ee44..c3b485ee44 100644
--- a/render-test/metrics/android/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
index 0ae5c2b955..0ae5c2b955 100644
--- a/render-test/metrics/android/render-tests/symbol-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-z-order/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
index 7fd4a50acc..7fd4a50acc 100644
--- a/render-test/metrics/android/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-z-order/disabled/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
index a12e0d95a2..a12e0d95a2 100644
--- a/render-test/metrics/android/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
index a2a690221e..a2a690221e 100644
--- a/render-test/metrics/android/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-z-order/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
index 56ad53b746..56ad53b746 100644
--- a/render-test/metrics/android/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
index b2c42d4f14..b2c42d4f14 100644
--- a/render-test/metrics/android/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/bottom-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
index 464c2a956b..464c2a956b 100644
--- a/render-test/metrics/android/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/bottom-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
index 30c4e8af6a..30c4e8af6a 100644
--- a/render-test/metrics/android/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
index c376bb29e4..c376bb29e4 100644
--- a/render-test/metrics/android/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/center/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json
index d76866b1a8..d76866b1a8 100644
--- a/render-test/metrics/android/render-tests/text-anchor/center/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json
index eeacae616c..eeacae616c 100644
--- a/render-test/metrics/android/render-tests/text-anchor/left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
index 29bc657ffe..29bc657ffe 100644
--- a/render-test/metrics/android/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json
index 7d2d72b858..7d2d72b858 100644
--- a/render-test/metrics/android/render-tests/text-anchor/right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/top-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
index 4b8cce9777..4b8cce9777 100644
--- a/render-test/metrics/android/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/top-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
index 2e6ddea96c..2e6ddea96c 100644
--- a/render-test/metrics/android/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-anchor/top/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json
index cdb8e0cfa0..cdb8e0cfa0 100644
--- a/render-test/metrics/android/render-tests/text-anchor/top/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
index 5dc05d23f7..5dc05d23f7 100644
--- a/render-test/metrics/android/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
index 78350cbcee..78350cbcee 100644
--- a/render-test/metrics/android/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-arabic/line-break/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
index 8220f43a1f..8220f43a1f 100644
--- a/render-test/metrics/android/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
index d53a1e63d2..d53a1e63d2 100644
--- a/render-test/metrics/android/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
index 1c735b0518..1c735b0518 100644
--- a/render-test/metrics/android/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json
index cdc218de2e..cdc218de2e 100644
--- a/render-test/metrics/android/render-tests/text-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json
index de164f128a..de164f128a 100644
--- a/render-test/metrics/android/render-tests/text-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json
index 39b5a0d095..39b5a0d095 100644
--- a/render-test/metrics/android/render-tests/text-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json
index c32d2c8dd5..c32d2c8dd5 100644
--- a/render-test/metrics/android/render-tests/text-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-arabic/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
index 36e057c446..36e057c446 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
index 1ebdc9b090..1ebdc9b090 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
index f7f0edc2f0..f7f0edc2f0 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
index 5dfadecdc9..5dfadecdc9 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index 312dedfbf0..312dedfbf0 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
index e4a8816967..e4a8816967 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 7cf8a26c5d..7cf8a26c5d 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-images/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
index 1c7d44f5fa..1c7d44f5fa 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-images/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
index 7dc2448836..7dc2448836 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 93918efdef..93918efdef 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 11484938c3..11484938c3 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted-text-color/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
index 080c028b3f..080c028b3f 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/formatted/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json
index c2a87931ac..c2a87931ac 100644
--- a/render-test/metrics/android/render-tests/text-field/formatted/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json
index 57d88c7774..57d88c7774 100644
--- a/render-test/metrics/android/render-tests/text-field/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json
index 1bf70680b2..1bf70680b2 100644
--- a/render-test/metrics/android/render-tests/text-field/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-field/token/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json
index 656864373f..656864373f 100644
--- a/render-test/metrics/android/render-tests/text-field/token/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-font/camera-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json
index d48b7874fe..d48b7874fe 100644
--- a/render-test/metrics/android/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-font/chinese/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json
index ad43d0f348..ad43d0f348 100644
--- a/render-test/metrics/android/render-tests/text-font/chinese/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-font/data-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json
index 3c0a34712f..3c0a34712f 100644
--- a/render-test/metrics/android/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-font/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json
index 0dce429c8f..0dce429c8f 100644
--- a/render-test/metrics/android/render-tests/text-font/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-blur/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
index ab3b1f30b3..ab3b1f30b3 100644
--- a/render-test/metrics/android/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-blur/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
index 1e07429f0e..1e07429f0e 100644
--- a/render-test/metrics/android/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-blur/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
index b1c2061cfa..b1c2061cfa 100644
--- a/render-test/metrics/android/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-blur/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
index 4cdc2d6d49..4cdc2d6d49 100644
--- a/render-test/metrics/android/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-color/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json
index 517ba9f554..517ba9f554 100644
--- a/render-test/metrics/android/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-color/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json
index 07d3752eff..07d3752eff 100644
--- a/render-test/metrics/android/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-color/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
index c1a1bbff0e..c1a1bbff0e 100644
--- a/render-test/metrics/android/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-color/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
index 5c9984e046..5c9984e046 100644
--- a/render-test/metrics/android/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-width/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json
index e2050632ce..e2050632ce 100644
--- a/render-test/metrics/android/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-width/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json
index b7b63c2d62..b7b63c2d62 100644
--- a/render-test/metrics/android/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
index fcffabbd6f..fcffabbd6f 100644
--- a/render-test/metrics/android/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-halo-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
index e5c6f83ccf..e5c6f83ccf 100644
--- a/render-test/metrics/android/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-justify/auto/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json
index 1347fbf5ea..1347fbf5ea 100644
--- a/render-test/metrics/android/render-tests/text-justify/auto/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-justify/left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json
index 7cc2ecb329..7cc2ecb329 100644
--- a/render-test/metrics/android/render-tests/text-justify/left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-justify/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json
index 47a29b1f02..47a29b1f02 100644
--- a/render-test/metrics/android/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-justify/right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json
index d8452ed55a..d8452ed55a 100644
--- a/render-test/metrics/android/render-tests/text-justify/right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
index 676440649d..676440649d 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 0161eefaf0..0161eefaf0 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 5c2f875f7c..5c2f875f7c 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index fb992f3ea6..fb992f3ea6 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index cdd8a1c6ff..cdd8a1c6ff 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
index 0d06ee9d30..0d06ee9d30 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index e3d9db9f7e..e3d9db9f7e 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 6e5d04bec3..6e5d04bec3 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 84c53c7b93..84c53c7b93 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 3f5753d8ae..3f5753d8ae 100644
--- a/render-test/metrics/android/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
index b614b064cf..b614b064cf 100644
--- a/render-test/metrics/android/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
index e0f08218d3..e0f08218d3 100644
--- a/render-test/metrics/android/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-letter-spacing/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
index d973cde033..d973cde033 100644
--- a/render-test/metrics/android/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
index f607bfc2d3..f607bfc2d3 100644
--- a/render-test/metrics/android/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index 1b47e0ef92..1b47e0ef92 100644
--- a/render-test/metrics/android/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-line-height/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json
index a644fb4f0d..a644fb4f0d 100644
--- a/render-test/metrics/android/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-angle/line-center/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
index e283d5dd40..e283d5dd40 100644
--- a/render-test/metrics/android/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-angle/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
index 14dc98c503..14dc98c503 100644
--- a/render-test/metrics/android/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
index f6e032ace5..f6e032ace5 100644
--- a/render-test/metrics/android/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/force-newline/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
index 1f7015cad5..1f7015cad5 100644
--- a/render-test/metrics/android/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
index c3054c077d..c3054c077d 100644
--- a/render-test/metrics/android/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index 2ae2e95b6a..2ae2e95b6a 100644
--- a/render-test/metrics/android/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json
index aff93f4f2f..aff93f4f2f 100644
--- a/render-test/metrics/android/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
index e41f0f0bb2..e41f0f0bb2 100644
--- a/render-test/metrics/android/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/zero-width-point-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/zero-width-point-placement/metrics.json
index 81f67be26f..81f67be26f 100644
--- a/render-test/metrics/android/render-tests/text-max-width/zero-width-point-placement/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/zero-width-point-placement/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
index ddd989a3fd..ddd989a3fd 100644
--- a/render-test/metrics/android/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
index e67379872d..e67379872d 100644
--- a/render-test/metrics/android/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index cead927fe3..cead927fe3 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index bc3c37496b..bc3c37496b 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 0fb2707425..0fb2707425 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 24833dc1a8..24833dc1a8 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index b2814aa0d4..b2814aa0d4 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index f4812aa4bf..f4812aa4bf 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index b921dbf6c6..b921dbf6c6 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6250fbd28f..6250fbd28f 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index ab983830ad..ab983830ad 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 898780c730..898780c730 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ffa7effac..6ffa7effac 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index b69c61afee..b69c61afee 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 58f01cddd4..58f01cddd4 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 02bb34f0e2..02bb34f0e2 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index bbc9cb16ad..bbc9cb16ad 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 51c36ee5fa..51c36ee5fa 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 67c39b6025..67c39b6025 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 21488ba062..21488ba062 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json
index 28d1edbee9..28d1edbee9 100644
--- a/render-test/metrics/android/render-tests/text-offset/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-offset/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json
index d470e4f9ba..d470e4f9ba 100644
--- a/render-test/metrics/android/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-opacity/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json
index 410a817ee1..410a817ee1 100644
--- a/render-test/metrics/android/render-tests/text-opacity/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-opacity/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json
index 9aa49c347a..9aa49c347a 100644
--- a/render-test/metrics/android/render-tests/text-opacity/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-opacity/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json
index 8bb63f059d..8bb63f059d 100644
--- a/render-test/metrics/android/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-opacity/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
index f2adedc6be..f2adedc6be 100644
--- a/render-test/metrics/android/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 3f096533da..3f096533da 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 684972f4d3..684972f4d3 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 175175f069..175175f069 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index c58ba37a9e..c58ba37a9e 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 189aa21b06..189aa21b06 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index 7c4cf83470..7c4cf83470 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index ac7cf313cc..ac7cf313cc 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index ab07bae4d1..ab07bae4d1 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index ec8b00b051..ec8b00b051 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index c76610f771..c76610f771 100644
--- a/render-test/metrics/android/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
index 9a9c313902..9a9c313902 100644
--- a/render-test/metrics/android/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-radial-offset/basic/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
index 2a7fbbaaca..2a7fbbaaca 100644
--- a/render-test/metrics/android/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
index 4177dcf100..4177dcf100 100644
--- a/render-test/metrics/android/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/anchor-left/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
index efcc2a4783..efcc2a4783 100644
--- a/render-test/metrics/android/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/anchor-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
index 74551509f9..74551509f9 100644
--- a/render-test/metrics/android/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/anchor-top/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
index c15a78c394..c15a78c394 100644
--- a/render-test/metrics/android/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json
index e413cd84e9..e413cd84e9 100644
--- a/render-test/metrics/android/render-tests/text-rotate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json
index 45ca7a3396..45ca7a3396 100644
--- a/render-test/metrics/android/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
index 641e269560..641e269560 100644
--- a/render-test/metrics/android/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotate/with-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
index 74c441a85d..74c441a85d 100644
--- a/render-test/metrics/android/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 0ab91c7654..0ab91c7654 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index fc2cdce3a7..fc2cdce3a7 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index f8f0194420..f8f0194420 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 5ea7e55cfc..5ea7e55cfc 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index f1635e3566..f1635e3566 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 6a1490d181..6a1490d181 100644
--- a/render-test/metrics/android/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
index 0127286ed2..0127286ed2 100644
--- a/render-test/metrics/android/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/camera-function-interval/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
index 26b80f2e66..26b80f2e66 100644
--- a/render-test/metrics/android/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/composite-expression/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
index 4e8d4a8ab7..4e8d4a8ab7 100644
--- a/render-test/metrics/android/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
index 8b6e723fab..8b6e723fab 100644
--- a/render-test/metrics/android/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/composite-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json
index 2d9b9f27f7..2d9b9f27f7 100644
--- a/render-test/metrics/android/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json
index b8a113e7aa..b8a113e7aa 100644
--- a/render-test/metrics/android/render-tests/text-size/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json
index c8e7571c7f..c8e7571c7f 100644
--- a/render-test/metrics/android/render-tests/text-size/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-size/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json
index dd991e1973..dd991e1973 100644
--- a/render-test/metrics/android/render-tests/text-size/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/nan/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/nan/metrics.json
new file mode 100644
index 0000000000..9ece39b2be
--- /dev/null
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/nan/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            1,
+            84942
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            1,
+            4,
+            9,
+            1,
+            [
+                35153,
+                35153
+            ],
+            [
+                58,
+                58
+            ],
+            [
+                448,
+                448
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/render-test/metrics/android/render-tests/text-size/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json
index 50ee51954a..50ee51954a 100644
--- a/render-test/metrics/android/render-tests/text-size/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
index 38ca87df97..38ca87df97 100644
--- a/render-test/metrics/android/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-transform/lowercase/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
index 16b45f9ae4..16b45f9ae4 100644
--- a/render-test/metrics/android/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-transform/property-function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json
index 8627872c9d..8627872c9d 100644
--- a/render-test/metrics/android/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-transform/uppercase/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
index 450ef4c207..450ef4c207 100644
--- a/render-test/metrics/android/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-translate-anchor/map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
index cf37af4370..cf37af4370 100644
--- a/render-test/metrics/android/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
index 16ef9cbe74..16ef9cbe74 100644
--- a/render-test/metrics/android/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-translate/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json
index 5bd1366be1..5bd1366be1 100644
--- a/render-test/metrics/android/render-tests/text-translate/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-translate/function/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json
index cfa1c32021..cfa1c32021 100644
--- a/render-test/metrics/android/render-tests/text-translate/function/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-translate/literal/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json
index 223b535c2f..223b535c2f 100644
--- a/render-test/metrics/android/render-tests/text-translate/literal/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 328062c1da..328062c1da 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index 11d7946fe1..11d7946fe1 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index 0df565318a..0df565318a 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index 6d5e8f6449..6d5e8f6449 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index 6f7d4566d2..6f7d4566d2 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index 0ab5215b6b..0ab5215b6b 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index afd222d031..afd222d031 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index 2422bcbe7a..2422bcbe7a 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index 3860efef38..3860efef38 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
index ca96121297..ca96121297 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 543d98773f..543d98773f 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
index 40a099961e..40a099961e 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index c8b9879788..c8b9879788 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index ecacbaf816..ecacbaf816 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
index 7233d80bfa..7233d80bfa 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index ab20fc4036..ab20fc4036 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index 0bf617349a..0bf617349a 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
index 4190b72e1b..4190b72e1b 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
index ec445e3ef2..ec445e3ef2 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 8ee1f0ba82..8ee1f0ba82 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
index 9116fec03b..9116fec03b 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
index b5c1603ee6..b5c1603ee6 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
index 97fc32f683..97fc32f683 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index b7012d1b01..b7012d1b01 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index fba46a13d3..fba46a13d3 100644
--- a/render-test/metrics/android/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-visibility/none/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json
index 51d58681e5..51d58681e5 100644
--- a/render-test/metrics/android/render-tests/text-visibility/none/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-visibility/visible/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json
index 17b416f4c9..17b416f4c9 100644
--- a/render-test/metrics/android/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 26aa7eeaaf..26aa7eeaaf 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
index f9604638e7..f9604638e7 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
index 0b214379d7..0b214379d7 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
index de2ff2b8b9..de2ff2b8b9 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index ac911f228f..ac911f228f 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 9353358aa3..9353358aa3 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index 1216185ac0..1216185ac0 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 6795d84380..6795d84380 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index 2463557557..2463557557 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 411ca64ec3..411ca64ec3 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 2179bb8f86..2179bb8f86 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index a4937d6b6f..a4937d6b6f 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 721fd7f3ce..721fd7f3ce 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 9b30987263..9b30987263 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index 30c99089e5..30c99089e5 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/render-test/metrics/android/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index 39a6f4c9b5..39a6f4c9b5 100644
--- a/render-test/metrics/android/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/render-test/metrics/android/render-tests/tilejson-bounds/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
index fcf3d99758..fcf3d99758 100644
--- a/render-test/metrics/android/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
index 3c6e2ed3cc..3c6e2ed3cc 100644
--- a/render-test/metrics/android/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
diff --git a/render-test/metrics/android/render-tests/tms/tms/metrics.json b/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json
index c0df6b5424..c0df6b5424 100644
--- a/render-test/metrics/android/render-tests/tms/tms/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-history/in/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json
index 939b67bb4b..939b67bb4b 100644
--- a/render-test/metrics/android/render-tests/zoom-history/in/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-history/out/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json
index 81979f475b..81979f475b 100644
--- a/render-test/metrics/android/render-tests/zoom-history/out/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/above/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
index 9ff2aa1bd6..9ff2aa1bd6 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/below/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
index b94cde7cab..b94cde7cab 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/in-range/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
index 8afd14b443..8afd14b443 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
index 458e367508..458e367508 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/was-above/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
index 718841c7f6..718841c7f6 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoom-visibility/was-below/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
index b930e7c87d..b930e7c87d 100644
--- a/render-test/metrics/android/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoomed-fill/default/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
index a44ec1f0a9..a44ec1f0a9 100644
--- a/render-test/metrics/android/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoomed-raster/fractional/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
index bd21809524..bd21809524 100644
--- a/render-test/metrics/android/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
index 29fead98a5..29fead98a5 100644
--- a/render-test/metrics/android/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/render-test/metrics/android/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
index 9c696f699a..9c696f699a 100644
--- a/render-test/metrics/android/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 29bc9c1326..9d19edd560 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -344,13 +344,13 @@ add_custom_command(
         ${CMAKE_COMMAND}
         -E
         copy
-        ${MBGL_ROOT}/render-test/android-manifest-probe-memory.json
+        ${MBGL_ROOT}/metrics/next-android-render-test-runner-probe-memory.json
         ${MBGL_ROOT}/android-manifest-probe-memory.json
     COMMAND
         ${CMAKE_COMMAND}
         -E
         copy
-        ${MBGL_ROOT}/render-test/android-manifest-probe-network-gfx.json
+        ${MBGL_ROOT}/metrics/next-android-render-test-runner-probe-gfx-network.json
         ${MBGL_ROOT}/android-manifest-probe-network-gfx.json
     COMMAND
         ${CMAKE_COMMAND}
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp
index 7e209aff3a..cc0d2042c5 100644
--- a/platform/android/src/test/render_test_runner.cpp
+++ b/platform/android/src/test/render_test_runner.cpp
@@ -257,7 +257,7 @@ void android_main(struct android_app* app) {
         auto runTestWithManifest =
             [&storagePath, &app, &outFd, &outEvents, &source](const std::string& manifest) -> bool {
             const std::string configFile = storagePath + manifest;
-            std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile};
+            std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile, "-u", "rebaseline"};
             std::vector<char*> argv;
             for (const auto& arg : arguments) {
                 argv.push_back(const_cast<char*>(arg.data()));
diff --git a/render-test/android-manifest.json b/render-test/android-manifest.json
deleted file mode 100644
index 00783aba60..0000000000
--- a/render-test/android-manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "base_test_path":"mapbox-gl-js/test/integration",
-    "expectation_paths":["render-test/expected", "render-test/expected/android"],
-    "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
-    "vendor_path":"vendor",
-    "asset_path": "mapbox-gl-js/test/integration",
-    "result_path": "/sdcard/",
-    "probes": ["probeGFX", "probeNetwork"],
-    "metric_path":"render-test/metrics/android"
-}  
diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt
index e440a7c514..c4ca0e97e4 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -13,7 +13,7 @@ vendor/mapbox-gl-styles/styles/
 vendor/mapbox-gl-styles/sprites/
 vendor/mvt-fixtures/real-world/
 render-test/ignores/
-render-test/metrics/android/
+metrics/next-android-render-test-runner/
 render-test/expected/
 android-manifest-probe-network-gfx.json
 android-manifest-probe-memory.json
diff --git a/render-test/manifest_parser.cpp b/render-test/manifest_parser.cpp
index e3217f0f50..6658b3ee0d 100644
--- a/render-test/manifest_parser.cpp
+++ b/render-test/manifest_parser.cpp
@@ -465,9 +465,13 @@ mbgl::optional<Manifest> ManifestParser::parseManifest(const std::string& manife
                 auto testId = defaultExpectationPath.string();
                 testId = testId.substr(rootLength + 1, testId.length() - rootLength - 1);
 
+                std::vector<mbgl::filesystem::path> expectedMetricPaths{expectedMetricPath};
+#if defined(__ANDROID__)
+                expectedMetricPaths.emplace_back("/sdcard/");
+#endif
                 testPaths.emplace_back(testPath,
                                        getTestExpectations(defaultExpectationPath, testId, expectationPaths),
-                                       getTestExpectations(defaultExpectationPath, testId, {expectedMetricPath}));
+                                       getTestExpectations(defaultExpectationPath, testId, expectedMetricPaths));
             }
         }
     }