[build] Cleanup CircleCI configuration

- Remove the legacy build jobs
- Remove the next- namespace.

5609 files changed, 316 insertions, 1135 deletions

diff --git a/circle.yml b/circle.yml
index 095fbcbca2..7b062bfd69 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,197 +1,166 @@
 version: 2.1
 
+#
+# This CI configuration heavily relies on templates and CMake. Most of the
+# jobs will have the following steps (usually configurable via parameters):
+# prepare, build and test.
+#
+# 'sanity-checks' and 'baselines' are special. The former will run a series
+# of checks to see if the patch has the minimum requirements for landing in
+# our repository and the latter will generate new baselines for the tests
+# in case the PR changes the baselines.
+#
 workflows:
   version: 2
-  mbgl-next:
+  development:
     jobs:
-      - next-sanity-checks
-      - next-android-benchmark-runner
-      - next-android-api-breakage
-      - next-android-render-test-runner
-      - next-android-unit-test-runner
-      - next-ios-render-test-runner
-      - next-baselines:
+      - sanity-checks
+      - android-benchmark-runner
+      - android-api-breakage
+      - android-render-test-runner
+      - android-unit-test-runner
+      - ios-render-test-runner
+      - baselines:
           requires:
-            - next-android-arm64-v8a-release
-            - next-android-armeabi-v7a-release
-            - next-android-render-test-runner
-            - next-android-x86-release
-            - next-android-x86_64-release
-            - next-linux-clang8-release
-            - next-linux-gcc8-release
-            - next-macos-xcode11-release
-      - next-build-template:
-          name: next-android-armeabi-v7a-release
+            - android-arm64-v8a-release
+            - android-armeabi-v7a-release
+            - android-render-test-runner
+            - android-x86-release
+            - android-x86_64-release
+            - linux-clang8-release
+            - linux-gcc8-release
+            - macos-xcode11-release
+      - build-template:
+          name: android-armeabi-v7a-release
           executor_name: ubuntu-disco
           target_is_android: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a'
           install: true
-      - next-build-template:
-          name: next-android-arm64-v8a-release
+      - build-template:
+          name: android-arm64-v8a-release
           executor_name: ubuntu-disco
           target_is_android: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
           build_params: '--target libmapbox-gl.so'
           install: true
-      - next-build-template:
-          name: next-android-x86-release
+      - build-template:
+          name: android-x86-release
           executor_name: ubuntu-disco
           target_is_android: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
           build_params: '--target libmapbox-gl.so'
           install: true
-      - next-build-template:
-          name: next-android-x86_64-release
+      - build-template:
+          name: android-x86_64-release
           executor_name: ubuntu-disco
           target_is_android: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
           build_params: '--target libmapbox-gl.so'
           install: true
-      - next-build-template:
-          name: next-linux-gcc8-release
+      - build-template:
+          name: linux-gcc8-release
           executor_name: ubuntu-disco
           target_is_linux: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'
           install: true
           metrics: true
           style_tests: true
-      - next-build-template:
-          name: next-linux-gcc4.9-release
+      - build-template:
+          name: linux-gcc4.9-release
           executor_name: ubuntu-disco
           target_is_linux: true
           requires:
-            - next-linux-gcc8-release
+            - linux-gcc8-release
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
           build_params: '--target mbgl-glfw'
           test_params: '-N -Q'
-      - next-build-template:
-          name: next-linux-gcc8-debug-coverage
+      - build-template:
+          name: linux-gcc8-debug-coverage
           executor_name: ubuntu-disco
           target_is_linux: true
           requires:
-            - next-linux-gcc8-release
+            - linux-gcc8-release
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=Debug -DMBGL_WITH_COVERAGE=ON'
           style_tests: true
-      - next-build-template:
-          name: next-linux-clang8-release
+      - build-template:
+          name: linux-clang8-release
           executor_name: ubuntu-disco
           target_is_linux: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
           install: true
           metrics: true
           style_tests: true
-      - next-build-template:
-          name: next-FIXME-linux-asan
+      - build-template:
+          name: FIXME-linux-asan
           executor_name: ubuntu-disco
           target_is_linux: true
           requires:
-            - next-sanity-checks
+            - sanity-checks
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=address'
           test_params: '|| true'
           style_tests: true
-      - next-build-template:
-          name: next-linux-tsan
+      - build-template:
+          name: linux-tsan
           executor_name: ubuntu-disco
           target_is_linux: true
           requires:
-            - next-sanity-checks
+            - sanity-checks
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=thread'
           style_tests: true
-      - next-build-template:
-          name: next-FIXME-linux-valgrind
+      - build-template:
+          name: FIXME-linux-valgrind
           executor_name: ubuntu-disco
           target_is_linux: true
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE'
           test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true'
-      - next-build-template:
-          name: next-FIXME-linux-ubsan
+      - build-template:
+          name: FIXME-linux-ubsan
           executor_name: ubuntu-disco
           target_is_linux: true
           requires:
-            - next-sanity-checks
+            - sanity-checks
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=undefined'
           test_params: '|| true'
           style_tests: true
-      - next-build-template:
-          name: next-qt5-linux-gcc5-release
+      - build-template:
+          name: qt5-linux-gcc5-release
           executor_name: ubuntu-disco
           target_is_linux: true
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON'
-      - next-build-template:
-          name: next-qt5-macos-gcc5-release
+      - build-template:
+          name: qt5-macos-gcc5-release
           executor_name: macos-11_0_0
           target_is_macos: true
           requires:
-            - next-qt5-linux-gcc5-release
+            - qt5-linux-gcc5-release
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)'
           test_params: '-N -Q'
-      - next-build-template:
-          name: next-macos-xcode11-release
+      - build-template:
+          name: macos-xcode11-release
           executor_name: macos-11_0_0
           target_is_macos: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
           install: true
           metrics: true
           style_tests: true
-      - next-build-template:
-          name: next-macos-xcode11-debug
+      - build-template:
+          name: macos-xcode11-debug
           executor_name: macos-11_0_0
           target_is_macos: true
           requires:
-            - next-macos-xcode11-release
+            - macos-xcode11-release
           config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug'
           style_tests: true
-      - next-ios-xcode11-release
-  mbgl-legacy:
-    jobs:
-      #
-      # Naming convention: {platform}-{additional description}-{build type}
-      #   - {platform} is the client platform/framework, which may differ from
-      #     the build platform. Specify both if applicable, e.g., "qt5-macos".
-      #   - {additional description} optionally describes the compiler or other
-      #     unique aspect of the build environment.
-      #   - {build type} is typically "debug" or "release".
-      #
-      - node-linux-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - node-macos-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - linux-clang-7-sanitize-address-undefined
-      - linux-clang-7-sanitize-thread
-      - linux-gcc5-debug-coverage
-      - linux-doxygen
-      - ios-debug
-      - ios-debug-xcode10
-      - ios-release-template:
-          name: ios-release
-      - ios-release-tag:
-          filters:
-            tags:
-              only: /ios-.*/
-            branches:
-              ignore: /.*/
-      - macos-debug
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 5 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - metrics-nightly
-      - ios-release-template:
-          name: ios-release-nightly
-      - ios-sanitize-nightly
-      - ios-sanitize-address-nightly
-      - ios-static-analyzer-nightly
-      - ios-static-analyzer-nightly-xcode10
-
+      - ios-xcode11-release
+
+#
+# Executors: we currently support two executors, one based on Ubuntu 19.04 aka Disco
+# and another based on macOS + Xcode 11.1.0. The Ubuntu executor is a lot more stable
+# and will produce reproduceable builds completely offline because it uses a docker
+# image with all the build dependencies preinstalled, whereas the macOS is managed
+# by CircleCI and will install dependencies on build time. Build results from the macOS
+# bots might differ if in meantime the macOS image gets updated. :-(
+#
 executors:
   ubuntu-disco:
     docker:
@@ -213,22 +182,13 @@ executors:
       HOMEBREW_NO_INSTALL_CLEANUP: 1
 
 commands:
-  next-prepare:
-    parameters:
-      use_sanity_check_ccache:
-        type: boolean
-        default: true
+  prepare:
     steps:
       - restore_cache:
           keys:
             - 'ccache-v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .Revision }}'
             - 'ccache-v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-'
             - 'ccache-v1-{{ .Environment.CIRCLE_JOB }}-master'
-      - when:
-          condition: << parameters.use_sanity_check_ccache >>
-          steps:
-            - restore_cache:
-                key: 'ccache-v1-next-sanity-checks-master'
       - run:
           name: Prepare
           command: |
@@ -237,38 +197,27 @@ commands:
             git gc
             npm install --ignore-scripts
             ulimit -c unlimited
-  next-prepare-linux:
+  prepare-linux:
     steps:
       - run:
           name: Prepare Linux
           background: true
           command: |
             Xvfb :99 -noreset -screen 0 1280x1024x24
-  next-prepare-macos:
-    parameters:
-      build-ios-test-runner:
-        type: boolean
-        default: false
+  prepare-macos:
     steps:
       - run:
           name: Prepare macOS
           command: |
-            brew install cmake ccache glfw ninja pkgconfig qt
-      - when:
-          condition: << parameters.build-ios-test-runner >>
-          steps:
-            - run:
-                name: Prepare macOS with extra environment
-                command: |
-                  brew cask install google-cloud-sdk	
-                  brew install chargepoint/xcparse/xcparse
+            brew install cmake ccache glfw ninja pkgconfig qt chargepoint/xcparse/xcparse
+            brew cask install google-cloud-sdk
       - run:
           name: Code Generators macOS
           command: |
               platform/darwin/scripts/generate-style-code.js
               platform/darwin/scripts/update-examples.js
               git add -A && git diff --staged --exit-code
-  next-config:
+  config:
     parameters:
       config_params:
         type: string
@@ -277,7 +226,7 @@ commands:
           name: Configure
           command: |
             cmake next -B build << parameters.config_params >>
-  next-build:
+  build:
     parameters:
       build_params:
         type: string
@@ -288,13 +237,13 @@ commands:
             ccache --zero-stats --max-size=2G
             cmake --build build -j 8 << parameters.build_params >>
             ccache --show-stats
-  next-install:
+  install:
     steps:
       - run:
           name: Install
           command: |
             cmake --build build --target install/strip
-  next-test:
+  test:
     parameters:
       test_params:
         type: string
@@ -304,7 +253,7 @@ commands:
           command: |
             cd build
             ctest -V << parameters.test_params >>
-  next-metrics:
+  metrics:
     parameters:
       step_name:
         type: string
@@ -315,7 +264,7 @@ commands:
           name: << parameters.step_name >>
           command: |
             build/mbgl-render-test-runner << parameters.metrics_params >>
-  next-save:
+  save:
     steps:
       - save_cache:
           key: 'ccache-v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .Revision }}'
@@ -352,362 +301,33 @@ commands:
       - store_artifacts:
           path: /tmp/tests
           destination: tests
-  npm-install:
-    steps:
-    - run:
-        name: npm install
-        command: npm install --ignore-scripts
-  prepare-environment:
-    steps:
-    - run:
-        name: Prepare environment
-        command: touch "$BASH_ENV" && ./scripts/environment.js | tee -a "$BASH_ENV"
-  prepare-ccache:
-    steps:
-    - run:
-        name: Prepare ccache
-        command: |
-          # CircleCI doesn't have any way to embed arbitrary environment variables or command output
-          # into cache keys, so we're using the workaround of writing the desired content to a file,
-          # and then using `{{ checksum "filename" }}` in the cache key.
-          echo "$CIRCLE_BRANCH"
-          echo "$CIRCLE_BRANCH" > .circle-branch
-          echo "$CIRCLE_SHA1"
-          echo "$CIRCLE_SHA1" > .circle-sha1
-          echo "$CIRCLE_TARGET_BRANCH"
-          echo "${CIRCLE_TARGET_BRANCH:master}" > .circle-target-branch
-          echo "$CIRCLE_MERGE_BASE"
-          echo "${CIRCLE_MERGE_BASE:master}" > .circle-merge-base
-          ccache --clear
-  reset-ccache-stats:
-    steps:
-    - run:
-        name: Clear ccache statistics
-        command: |
-          ccache --zero-stats
-          ccache --max-size=2G
-          ccache --show-stats
-  show-ccache-stats:
-    steps:
-    - run:
-        name: Show ccache statistics
-        command: ccache --show-stats
-
-
-  save-node_modules-cache:
-    steps:
-    - save_cache:
-        name: Save node_modules cache
-        key: 'node_modules/v1/{{ arch }}/{{ checksum "package.json" }}'
-        paths: [ "node_modules" ]
-  restore-node_modules-cache:
-    steps:
-    - restore_cache:
-        name: Restore node_modules cache
-        keys:
-          - 'node_modules/v1/{{ arch }}/{{ checksum "package.json" }}'
-          - 'node_modules/v1/{{ arch }}'
-  save-mason_packages-cache:
-    steps:
-    - save_cache:
-        name: Save mason_packages cache
-        key: 'mason_packages/v3/{{ arch }}/{{ checksum "cmake/mason-dependencies.cmake" }}'
-        paths: [ "mason_packages/.binaries" ]
-  restore-mason_packages-cache:
-    steps:
-    - restore_cache:
-        name: Restore mason_packages cache
-        keys:
-          - 'mason_packages/v3/{{ arch }}/{{ checksum "cmake/mason-dependencies.cmake" }}'
-          - 'mason_packages/v3/{{ arch }}'
-  save-ccache:
-    steps:
-    - save_cache:
-        name: Save ccache
-        key: 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}/{{ checksum ".circle-branch" }}/{{ checksum ".circle-sha1" }}'
-        paths: [ "~/.ccache" ]
-  restore-ccache:
-    steps:
-    - restore_cache:
-        name: Restore ccache
-        keys:
-          - 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}/{{ checksum ".circle-branch" }}/{{ checksum ".circle-sha1" }}'
-          - 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}/{{ checksum ".circle-branch" }}'
-          - 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}/{{ checksum ".circle-target-branch" }}/{{ checksum ".circle-merge-base" }}'
-          - 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}/{{ checksum ".circle-target-branch" }}'
-          - 'ccache/v1/{{ arch }}/{{ .Environment.CIRCLE_JOB }}'
-  install-dependencies:
-    parameters:
-      node_modules:
-        type: boolean
-        default: true
-      ccache:
-        type: boolean
-        default: true
-      mason:
-        type: boolean
-        default: true
-    steps:
-      - checkout
-      - when:
-          condition: << parameters.node_modules >>
-          steps: [ restore-node_modules-cache, npm-install ]
-      - prepare-environment
-      - when:
-          condition: << parameters.ccache >>
-          steps: [ prepare-ccache, restore-ccache, reset-ccache-stats ]
-      - when:
-          condition: << parameters.mason >>
-          steps: [ restore-mason_packages-cache ]
-  save-dependencies:
-    parameters:
-      node_modules:
-        type: boolean
-        default: true
-      ccache:
-        type: boolean
-        default: true
-      mason:
-        type: boolean
-        default: true
-    steps:
-      - when:
-          condition: << parameters.node_modules >>
-          steps: [ save-node_modules-cache ]
-      - when:
-          condition: << parameters.ccache >>
-          steps: [ save-ccache, show-ccache-stats ]
-      - when:
-          condition: << parameters.mason >>
-          steps: [ save-mason_packages-cache ]
-
-  setup-llvm-symbolizer:
-    steps:
-    - run:
-        name: Environment Setup
-        command: |
-          # LLVM has a hard check for "llvm-symbolizer" and doesn't support suffixed executables
-          ln -s /usr/bin/llvm-symbolizer-* /usr/bin/llvm-symbolizer
-          # We'll use tee to redirect stderr to a file so we can check for sanitiziation
-          # https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/1059947
-          sed -i 's/"$@" 2>&1/"$@"/' /usr/bin/xvfb-run
-
-
-  configure-cmake:
-    steps:
-    - run:
-        name: CMake configuration step
-        command: |
-          mkdir -p build
-          cd build
-          cmake -DWITH_COVERAGE=${WITH_COVERAGE:0} -DWITH_OSMESA=${WITH_OSMESA:0} -DWITH_EGL=${WITH_EGL:0} ..
-          cd ..
-  build-node:
-    steps:
-    - run:
-        name: Build node
-        command: make node-all
-  build-linux:
-    steps:
-    - run:
-        name: Build linux
-        command: make linux
-  build-benchmark:
-    steps:
-    - run:
-        name: Build benchmark
-        command: make benchmark
-  build-test:
-    steps:
-    - run:
-        name: Build test
-        command: make test
-  build-ios-test:
-    steps:
-    - run:
-        name: Build ios-test
-        command: make ios-test
-        no_output_timeout: 2m
-  build-ios-integration-test:
-    steps:
-    - run:
-        name: Build ios-integration-test
-        command: make ios-integration-test
-  build-macos-test:
-    steps:
-    - run:
-        name: Build and run macOS tests
-        command: make run-test
-        no_output_timeout: 2m
-
-
-  check-public-symbols:
-    steps:
-    - run:
-        name: Check public symbols
-        command: make darwin-check-public-symbols
-
-
-  conditionally-skip-firebase:
-    steps:
-    - run:
-        name: Check if Firebase should be skipped
-        command: |
-          FIREBASE_TAG=$( git diff origin/$CIRCLE_TARGET_BRANCH... --stat | grep -ivE -e"ios|macos|darwin" || true )
-          if [ -z "${FIREBASE_TAG}" ]; then
-            echo "Skipping Firebase tests because commits changed only Darwin-specific paths."
-            echo 'export SKIP_FIREBASE=1' >> $BASH_ENV
-          fi
   login-google-cloud-platform:
     steps:
     - run:
-        name: Log in to Google Cloud Platform
-        command: |
-          if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-            echo "${GCLOUD_SERVICE_ACCOUNT_JSON}" > secret.json
-            gcloud auth activate-service-account --key-file secret.json --project android-gl-native
-            rm secret.json
-          fi
-
-
-  install-ios-packaging-dependencies:
-    steps:
-    - run:
-        name: Install iOS packaging dependencies
-        command: |
-          echo "ruby-2.6" > ~/.ruby-version
-          ./platform/ios/scripts/install-packaging-dependencies.sh
-        background: true
-
-  install-macos-dependencies:
-    steps:
-    - run:
-        name: Install macOS dependencies
-        command: brew install cmake ccache
-
-  install-node-macos-dependencies:
-    steps:
-    - run:
-        name: Install Node macOS dependencies
+        name: Login Google Cloud Platform
         command: |
-          brew install node@8
-          brew link node@8 --force --overwrite
-
-  run-node-macos-tests:
-    steps:
-    - run:
-        name: Run node tests
-        command: make test-node
-
-  run-node-linux-tests:
-    parameters:
-      node_version:
-        type: string
-        default: v8
-    steps:
-    - run:
-        name: Run node tests
-        command: |
-          . "$NVM_DIR/nvm.sh" && nvm use << parameters.node_version >>
-          xvfb-run --server-args="-screen 0 1024x768x24" \
-            logbt -- apitrace trace --api=egl -v make test-node
-
-  run-unit-tests:
-    steps:
-    - run:
-        name: Run tests
-        command: |
-          xvfb-run --server-args="-screen 0 1024x768x24" \
-            make run-test
-
-  run-unit-tests-sanitized:
-    steps:
-    - run:
-        name: Run tests
-        command: |
-          # Source.RenderTileSetSourceUpdate and Source.InvisibleSourcesTileNecessity are filtered out due to #15294
-          xvfb-run --server-args="-screen 0 1024x768x24" make run-test--Source.RenderTileSetSourceUpdate:Source.InvisibleSourcesTileNecessity 2> >(tee sanitizer 1>&2)
-          # Unfortunately, Google Test eats the status code, so we'll have to check the output.
-          [ -z "$(sed -n '/^SUMMARY: .*Sanitizer:/p' sanitizer)" ]
-
-  publish-node-package:
-    steps:
-    - run:
-        name: Publish node package
-        when: on_success
-        command: platform/node/scripts/publish.sh
-
-  collect-xcode-build-logs:
-    steps:
-    - run:
-        name: Collect Xcode build logs
-        when: always
-        command: |
-          export XCODE_LOG_DIR=build/logs
-          mkdir -p $XCODE_LOG_DIR
-          cp build/*.log $XCODE_LOG_DIR
-  upload-xcode-build-logs:
-    steps:
-    - store_artifacts:
-        path: build/logs
-
-
-  notify-slack-nightly-failure:
-    steps:
-    - run:
-        name: Send a Slack notification on nightly failure
-        when: on_fail
-        command: |
-          if [[ $CIRCLE_BRANCH == master ]]; then
-            export SLACK_MESSAGE="Nightly build of \`$CIRCLE_JOB\` <$CIRCLE_BUILD_URL|failed>."
-            export SLACK_COLOR="danger"
-            scripts/notify-slack.sh
-          fi
-
-  #
-  # Add this step to all regular jobs to enable skipping of certain non-code-related changes.
-  #
-  # Do not include this step in nightly or release deployment jobs.
-  #
-  # To make a job potentially skippable on changes unrelated to its platform, it must:
-  #   - Target one of the skippable platforms: Android, iOS, or macOS.
-  #   - Have a job name that begins with a supported platform name.
-  #   - Not be related to core functionality or rendering tests. Job names that
-  #     contain "render-tests" cannot be skipped by platform changes.
-  #
-  # See the script in the following step for how to implement support for other platforms.
-  #
-  check-if-this-job-can-be-skipped:
-    steps:
-    - run:
-        name: Check if this job can be skipped
-        command: |
-          if [[ $CIRCLE_BRANCH != master ]] && [[ $CIRCLE_BRANCH != release-* ]] && [[ -z $CIRCLE_TAG ]]; then
-            scripts/check-ci-job-skippability.js
-          fi
-
+          echo "${GCLOUD_SERVICE_ACCOUNT_JSON}" > secret.json
+          gcloud auth activate-service-account --key-file secret.json --project android-gl-native
+          rm secret.json
 jobs:
-  next-ios-xcode11-release:
+  ios-xcode11-release:
     executor: macos-11_0_0
     steps:
       - checkout
-      - next-prepare:
-          use_sanity_check_ccache: false
-      - next-prepare-macos
+      - prepare
+      - prepare-macos
       - run:
           name: Build
           command: |
             cmake next -B Build -G Xcode -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator
             cd Build && xcodebuild -sdk iphonesimulator -project Mapbox\ GL\ Native.xcodeproj -configuration Release
-      - next-save
-  next-ios-render-test-runner:
+      - save
+  ios-render-test-runner:
     executor: macos-11_0_0
     steps:
       - checkout
-      - next-prepare:
-          use_sanity_check_ccache: false
-      - next-prepare-macos:
-          build-ios-test-runner: true
+      - prepare
+      - prepare-macos
       - run:
           name: Prepare codesign keychain 
           command: |
@@ -770,12 +390,12 @@ jobs:
               cd ../.. && mkdir -p /tmp/tests/ios-render-test
               if ls render-test-app/TestLogs/*.html 1> /dev/null 2>&1; then cp render-test-app/TestLogs/*.html /tmp/tests/ios-render-test; fi
             fi
-      - next-save
-  next-android-benchmark-runner:
+      - save
+  android-benchmark-runner:
     executor: ubuntu-disco
     steps:
       - checkout
-      - next-prepare
+      - prepare
       - run:
           name: Build BenchmarkRunner APK
           command: |
@@ -786,43 +406,39 @@ jobs:
           name: Run BenchmarkRunner on Firebase
           no_output_timeout: 20m
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              gcloud firebase test android models list
-              gcloud firebase test android run --type instrumentation \
-                --app benchmark/android/app/build/outputs/apk/release/app-release.apk \
-                --test benchmark/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
-                --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
-                --directories-to-pull /sdcard/benchmark/results --results-dir benchmark-${CIRCLE_BUILD_NUM} \
-                --no-record-video --no-performance-metrics
-            fi
+            gcloud firebase test android models list
+            gcloud firebase test android run --type instrumentation \
+              --app benchmark/android/app/build/outputs/apk/release/app-release.apk \
+              --test benchmark/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
+              --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
+              --directories-to-pull /sdcard/benchmark/results --results-dir benchmark-${CIRCLE_BUILD_NUM} \
+              --no-record-video --no-performance-metrics
       - run:
           name: Retrieve TestResult from gcloud
           when: always
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/benchmark-${CIRCLE_BUILD_NUM}/**/results/results.json)
-              mkdir -p /tmp/tests/benchmark
-              gsutil cp $testResult /tmp/tests/benchmark
-            fi
-  next-android-api-breakage:
+            testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/benchmark-${CIRCLE_BUILD_NUM}/**/results/results.json)
+            mkdir -p /tmp/tests/benchmark
+            gsutil cp $testResult /tmp/tests/benchmark
+  android-api-breakage:
     executor: ubuntu-disco
     steps:
       - run:
           name: Clone mapbox-gl-native-android in working directory
           command: git clone https://github.com/mapbox/mapbox-gl-native-android.git .
-      - next-prepare
+      - prepare
       - run:
           name: Update mapbox-gl-native to match PR
           command: cd vendor/mapbox-gl-native && git fetch origin $CIRCLE_SHA1 && git checkout $CIRCLE_SHA1 && git submodule update --init --recursive
       - run:
           name: Build SDK
           command: BUILDTYPE=Release make android-arm-v8
-      - next-save
-  next-android-unit-test-runner:
+      - save
+  android-unit-test-runner:
     executor: ubuntu-disco
     steps:
       - checkout
-      - next-prepare
+      - prepare
       - run:
           name: Build UnitTestRunner APK
           command: |
@@ -833,30 +449,26 @@ jobs:
           name: Run UnitTestRunner on Firebase
           no_output_timeout: 20m
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              gcloud firebase test android models list
-              gcloud firebase test android run --type instrumentation \
-                --app test/android/app/build/outputs/apk/release/app-release.apk \
-                --test test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
-                --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
-                --directories-to-pull /sdcard/test/results --results-dir unit-test-${CIRCLE_BUILD_NUM} \
-                --no-record-video --no-performance-metrics
-            fi
+            gcloud firebase test android models list
+            gcloud firebase test android run --type instrumentation \
+              --app test/android/app/build/outputs/apk/release/app-release.apk \
+              --test test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
+              --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
+              --directories-to-pull /sdcard/test/results --results-dir unit-test-${CIRCLE_BUILD_NUM} \
+              --no-record-video --no-performance-metrics
       - run:
           name: Retrieve Test Result from gcloud
           when: always
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/unit-test-${CIRCLE_BUILD_NUM}/**/results/results.xml)
-              mkdir -p /tmp/tests/unit-test
-              gsutil cp $testResult /tmp/tests/unit-test
-            fi
-      - next-save
-  next-android-render-test-runner:
+            testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/unit-test-${CIRCLE_BUILD_NUM}/**/results/results.xml)
+            mkdir -p /tmp/tests/unit-test
+            gsutil cp $testResult /tmp/tests/unit-test
+      - save
+  android-render-test-runner:
     executor: ubuntu-disco
     steps:
       - checkout
-      - next-prepare
+      - prepare
       - run:
           name: Build RenderTestRunner APK
           command: |
@@ -867,38 +479,32 @@ jobs:
           name: Run RenderTestRunner Instrumentation Test on Firebase
           no_output_timeout: 20m
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              gcloud firebase test android models list
-              gcloud firebase test android run --type instrumentation \
-                --app render-test/android/app/build/outputs/apk/release/app-release.apk \
-                --test render-test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
-                --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
-                --directories-to-pull /sdcard --results-dir render-test-app-${CIRCLE_BUILD_NUM} \
-                --no-record-video --no-performance-metrics
-            fi
+            gcloud firebase test android models list
+            gcloud firebase test android run --type instrumentation \
+              --app render-test/android/app/build/outputs/apk/release/app-release.apk \
+              --test render-test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
+              --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
+              --directories-to-pull /sdcard --results-dir render-test-app-${CIRCLE_BUILD_NUM} \
+              --no-record-video --no-performance-metrics
       - run:
           name: Retrieve TestResult from gcloud
           when: always
           command: |
-            if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html)
-              mkdir -p /tmp/tests/render-test-app
-              gsutil cp $testResult /tmp/tests/render-test-app
-            fi
+            testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html)
+            mkdir -p /tmp/tests/render-test-app
+            gsutil cp $testResult /tmp/tests/render-test-app
       - run:
           name: Retrieve Rebaselined Metrics from gcloud
           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/baselines/*) || true
-              gsutil -m cp -r $metricsResult metrics/next-android-render-test-runner/ || true
-            fi
-      - next-save
-  next-sanity-checks:
+            metricsResult=$(gsutil ls -d gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/*/*/sdcard/baselines/*) || true
+            gsutil -m cp -r $metricsResult metrics/android-render-test-runner/ || true
+      - save
+  sanity-checks:
     executor: ubuntu-disco
     steps:
       - checkout
-      - next-prepare
-      - next-config:
+      - prepare
+      - config:
           config_params: '-G Ninja -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
       - run:
           name: Code Generators
@@ -927,26 +533,26 @@ jobs:
           command: |
             run-clang-tidy-8 -quiet -j24 -p build $PWD/src/.*cpp $PWD/platform/.*cpp |tee clang-tidy.log
             grep -o \\[[a-z].*-.*[a-z]\] clang-tidy.log |sort |uniq -c |sort -n
-      - next-save
-  next-baselines:
+      - save
+  baselines:
     executor: ubuntu-disco
     steps:
       - checkout
-      - next-prepare
-      - next-prepare-linux
+      - prepare
+      - prepare-linux
       - attach_workspace:
           at: /tmp/attach
       - run:
           name: 'Binary Size'
           command: |
-            /tmp/attach/install/next-linux-gcc8-release/bin/mbgl-render-test-runner -u rebaseline -p metrics/next-binary-size.json
+            /tmp/attach/install/linux-gcc8-release/bin/mbgl-render-test-runner -u rebaseline -p metrics/binary-size.json
       - run:
           name: 'Matrics Baselines'
           command: |
             cp -r /tmp/attach/metrics .
             git add -A && git diff --staged --exit-code | tee baselines.patch
-      - next-save
-  next-build-template:
+      - save
+  build-template:
     parameters:
       config_params:
         type: string
@@ -983,472 +589,47 @@ jobs:
       - when:
           condition: << parameters.target_is_android >>
           steps:
-            - next-prepare
-            - next-config:
+            - prepare
+            - config:
                 config_params: << parameters.config_params >>
-            - next-build:
+            - build:
                 build_params: << parameters.build_params >>
       - when:
           condition: << parameters.target_is_linux >>
           steps:
-            - next-prepare
-            - next-prepare-linux
-            - next-config:
+            - prepare
+            - prepare-linux
+            - config:
                 config_params: << parameters.config_params >>
-            - next-build:
+            - build:
                 build_params: << parameters.build_params >>
-            - next-test:
+            - test:
                 test_params: << parameters.test_params >>
       - when:
           condition: << parameters.target_is_macos >>
           steps:
-            - next-prepare:
-                use_sanity_check_ccache: false
-            - next-prepare-macos
-            - next-config:
+            - prepare
+            - prepare-macos
+            - config:
                 config_params: << parameters.config_params >>
-            - next-build:
+            - build:
                 build_params: << parameters.build_params >>
-            - next-test:
+            - test:
                 test_params: << parameters.test_params >>
       - when:
           condition: << parameters.install >>
           steps:
-            - next-install
+            - install
       - when:
           condition: << parameters.style_tests >>
           steps:
-            - next-metrics:
+            - metrics:
                 step_name: 'Style Tests'
                 metrics_params: '-u rebaseline -p metrics/$CIRCLE_JOB-style.json'
       - when:
           condition: << parameters.metrics >>
           steps:
-            - next-metrics:
+            - metrics:
                 step_name: 'Metrics'
                 metrics_params: '-u rebaseline -p metrics/$CIRCLE_JOB-metrics.json'
-      - next-save
-# ------------------------------------------------------------------------------
-  node-linux-release:
-    docker:
-      - image: mbgl/linux-clang-3.9:2077f965ed
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: RelWithDebInfo
-      WITH_EGL: 1
-    steps:
-      - install-dependencies
-      - build-node
-      - save-dependencies
-      - run-node-linux-tests
-      - publish-node-package
-
-# ------------------------------------------------------------------------------
-  node-macos-release:
-    macos:
-      xcode: "11.1.0"
-    environment:
-      BUILDTYPE: RelWithDebInfo
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-    steps:
-      - install-macos-dependencies
-      - install-node-macos-dependencies
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - build-node
-      - save-dependencies
-      - run-node-macos-tests
-      - publish-node-package
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
-  linux-clang-7-sanitize-address-undefined:
-    docker:
-      - image: mbgl/linux-clang-7:a5a3c52107
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Sanitize
-      WITH_EGL: 1
-      GDB: '' # Do not run with GDB
-      CXXFLAGS: -fsanitize=address -fsanitize=undefined
-      LDFLAGS: -fsanitize=address -fsanitize=undefined
-      ASAN_OPTIONS: detect_leaks=0:color=always:print_summary=1
-      UBSAN_OPTIONS: print_stacktrace=1:color=always:print_summary=1
-    steps:
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - setup-llvm-symbolizer
-      - build-test
-      - save-dependencies
-      - run-unit-tests-sanitized
-
-# ------------------------------------------------------------------------------
-  linux-clang-7-sanitize-thread:
-    docker:
-      - image: mbgl/linux-clang-7:a5a3c52107
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Sanitize
-      WITH_EGL: 1
-      GDB: '' # Do not run with GDB
-      CXXFLAGS: -fsanitize=thread
-      LDFLAGS: -fsanitize=thread
-      TSAN_OPTIONS: color=always:print_summary=1
-    steps:
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - setup-llvm-symbolizer
-      - build-test
-      - save-dependencies
-      - run-unit-tests-sanitized
-
-# ------------------------------------------------------------------------------
-  linux-gcc5-debug-coverage:
-    docker:
-      - image: mbgl/linux-gcc-5:54f59e3ac5
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Debug
-      WITH_EGL: 1
-      WITH_COVERAGE: 1
-    steps:
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - build-linux
-      - build-benchmark
-      - build-test
-      - save-dependencies
-      - run-unit-tests
-      - run:
-          name: Upload coverage results to codecov.io
-          command: |
-            bash <(curl -sSfL https://codecov.io/bash) || echo 'Codecov failed to upload'
-      - run:
-          name: Upload coverage metrics to s3
-          command: |
-            if [[ $CIRCLE_BRANCH == master ]]; then
-                scripts/publish_core_codecoverage.js -p Linux -s Core
-            fi
-
-# ------------------------------------------------------------------------------
-  linux-doxygen:
-    docker:
-      - image: mbgl/linux-gcc-5:54f59e3ac5
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 2
-      JOBS: 2
-      BUILDTYPE: Debug
-      WITH_EGL: 1
-      WITH_COVERAGE: 1
-    steps:
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - run:
-          name: Install doxygen
-          command: apt update && apt install -y doxygen
-      - build-linux
-      - save-dependencies
-      - run:
-          name: Check documentation coverage
-          command: |
-              platform/linux/ninja -C "build/linux-$(uname -m)/Debug" doxygen_coverage
-              scripts/publish_doxygen_coverage.js "build/linux-$(uname -m)/Debug/doxygen-coverage.json"
-
-# ------------------------------------------------------------------------------
-  ios-debug:
-    macos:
-      xcode: "11.1.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - check-public-symbols
-      - run:
-          name: Lint podspecs and plist files
-          command: make ios-lint
-      - check-if-this-job-can-be-skipped
-      - build-ios-test
-      - run:
-          name: Check symbol namespacing for mapbox-events-ios
-          command: make ios-check-events-symbols
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
-  ios-debug-xcode10:
-    macos:
-      xcode: "10.3.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - check-public-symbols
-      - run:
-          name: Lint podspecs and plist files
-          command: make ios-lint
-      - check-if-this-job-can-be-skipped
-      - build-ios-test
-      - run:
-          name: Check symbol namespacing for mapbox-events-ios
-          command: make ios-check-events-symbols
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
-  ios-sanitize-nightly:
-    macos:
-      xcode: "11.1.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - run:
-          name: Build and run SDK unit tests with thread and undefined behavior sanitizers
-          command: make ios-sanitize
-      - run:
-          name: Get iOS code coverage
-          command: |
-            echo "Skipping iOS code coverage"
-          # Currently failing, need to update for Xcode 11
-          # platform/ios/scripts/ios-code-coverage.sh CI
-          #
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - notify-slack-nightly-failure
-
-# ------------------------------------------------------------------------------
-  ios-sanitize-address-nightly:
-    macos:
-      xcode: "11.1.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - run:
-          name: Build and run SDK unit tests with address sanitizer
-          command: make ios-sanitize-address
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - notify-slack-nightly-failure
-
-# ------------------------------------------------------------------------------
-  ios-static-analyzer-nightly:
-    macos:
-      xcode: "11.1.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - run:
-          name: Build and run SDK unit tests with the static analyzer
-          command: make ios-static-analyzer
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - notify-slack-nightly-failure
-
-# ------------------------------------------------------------------------------
-  ios-static-analyzer-nightly-xcode10:
-    macos:
-      xcode: "10.3.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - run:
-          name: Build and run SDK unit tests with the static analyzer
-          command: make ios-static-analyzer
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - notify-slack-nightly-failure
-
-# ------------------------------------------------------------------------------
-  ios-release-template:
-    macos:
-      xcode: "11.1.0"
-    shell: /bin/bash --login -eo pipefail
-    environment:
-      BUILDTYPE: Release
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - install-ios-packaging-dependencies
-      - run:
-          name: Build dynamic framework for device and simulator
-          command: make iframework BUILD_DOCS=false
-          no_output_timeout: 5m
-      - deploy:
-          name: Upload snapshot build to s3
-          command: |
-            if [[ $CIRCLE_BRANCH == master ]]; then
-              platform/ios/scripts/deploy-snapshot.sh
-            fi
-      - deploy:
-          name: Deploy to Mapbox CocoaPods spec repo
-          command: |
-            if [[ $CIRCLE_BRANCH == master ]]; then
-              platform/ios/scripts/deploy-to-cocoapods.sh
-            fi
-      - run:
-         name: Record size
-         command: |
-              echo "Skipping Record size step"
-              # Skipping due to https://github.com/mapbox/mapbox-gl-native/issues/15751
-              #platform/ios/scripts/metrics.sh
-      - run:
-          name: Trigger metrics
-          command: |
-            if [[ $CIRCLE_BRANCH == master ]]; then
-              if [ -n "${MOBILE_METRICS_TOKEN}" ]; then
-                curl -u ${MOBILE_METRICS_TOKEN}: -d build_parameters[CIRCLE_JOB]=ios-maps-benchmark https://circleci.com/api/v1.1/project/github/mapbox/mobile-metrics/tree/master
-              else
-                echo "MOBILE_METRICS_TOKEN not provided"
-              fi
-            fi
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - notify-slack-nightly-failure
-
-# ------------------------------------------------------------------------------
-  ios-release-tag:
-    macos:
-      xcode: "11.0.0"
-    shell: /bin/bash --login -eo pipefail
-    environment:
-      BUILDTYPE: Release
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-      SLACK_CHANNEL: C0ACM9Q2C
-    steps:
-      - checkout
-      - run:
-          name: Send a Slack notification on start
-          command: |
-            export SLACK_MESSAGE="<$CIRCLE_BUILD_URL|Release build for \`$CIRCLE_TAG\` started.>"
-            scripts/notify-slack.sh
-      - install-macos-dependencies
-      - install-dependencies
-      - install-ios-packaging-dependencies
-      - run:
-          name: Trigger external deploy steps
-          command: |
-            export VERSION_TAG=${CIRCLE_TAG}
-            export GITHUB_TOKEN=${DANGER_GITHUB_API_TOKEN}
-            export DOCS_REPO="ios-sdk"
-            scripts/trigger-maps-documentation-deploy-steps.sh
-      - run:
-          name: Build, package, and upload iOS release
-          command: |
-            export VERSION_TAG=${CIRCLE_TAG}
-            export GITHUB_TOKEN=${DANGER_GITHUB_API_TOKEN}
-            platform/ios/scripts/deploy-packages.sh
-      - deploy:
-          name: Deploy to CocoaPods
-          command: platform/ios/scripts/deploy-to-cocoapods.sh
-      - save-dependencies
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-      - run:
-          name: Send a Slack notification on failure
-          when: on_fail
-          command: |
-            export SLACK_MESSAGE="<$CIRCLE_BUILD_URL|Release build for \`$CIRCLE_TAG\` failed.>"
-            export SLACK_COLOR="danger"
-            scripts/notify-slack.sh
-      - run:
-          name: Send a Slack notification on success
-          when: on_success
-          command: |
-            export SLACK_MESSAGE="<$CIRCLE_BUILD_URL|Release build for \`$CIRCLE_TAG\` succeeded.>"
-            export SLACK_COLOR="good"
-            scripts/notify-slack.sh
-
-# ------------------------------------------------------------------------------
-  macos-debug:
-    macos:
-      xcode: "10.1.0"
-    environment:
-      BUILDTYPE: Debug
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-    steps:
-      - install-macos-dependencies
-      - install-dependencies
-      - check-if-this-job-can-be-skipped
-      - build-macos-test
-      - check-public-symbols
-      - run:
-          name: Lint plist files
-          command: make macos-lint
-      - run:
-          name: Nitpick Darwin code generation
-          command: scripts/nitpick/generated-code.js darwin
-      - save-dependencies
-      - store_artifacts:
-          path: test/fixtures
-          destination: test/fixtures
-      - collect-xcode-build-logs
-      - upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
-  metrics-nightly:
-    docker:
-      - image: mbgl/linux-gcc-5:54f59e3ac5
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 2
-      JOBS: 2
-    steps:
-      - install-dependencies
-      - run:
-          name: Collect GitHub statistics
-          command: |
-              scripts/publish_github_stats.js
+      - save
diff --git a/metrics/next-FIXME-linux-asan-style.json b/metrics/FIXME-linux-asan-style.json
index 7c99b2784c..7c99b2784c 100644
--- a/metrics/next-FIXME-linux-asan-style.json
+++ b/metrics/FIXME-linux-asan-style.json
diff --git a/metrics/next-FIXME-linux-ubsan-style.json b/metrics/FIXME-linux-ubsan-style.json
index 7c99b2784c..7c99b2784c 100644
--- a/metrics/next-FIXME-linux-ubsan-style.json
+++ b/metrics/FIXME-linux-ubsan-style.json
diff --git a/metrics/next-android-render-test-runner-metrics.json b/metrics/android-render-test-runner-metrics.json
index 415c786b00..2be1325d14 100644
--- a/metrics/next-android-render-test-runner-metrics.json
+++ b/metrics/android-render-test-runner-metrics.json
@@ -10,7 +10,7 @@
         "ignores/platform-linux.json",
         "ignores/platform-android.json"
     ],
-    "metric_path": "next-android-render-test-runner",
+    "metric_path": "android-render-test-runner",
     "probes": [
         "probeGFX",
         "probeMemory",
diff --git a/metrics/next-android-render-test-runner-style.json b/metrics/android-render-test-runner-style.json
index fb774b97dc..efc42d7321 100644
--- a/metrics/next-android-render-test-runner-style.json
+++ b/metrics/android-render-test-runner-style.json
@@ -10,7 +10,7 @@
         "ignores/platform-linux.json",
         "ignores/platform-android.json"
     ],
-    "metric_path": "next-android-render-test-runner",
+    "metric_path": "android-render-test-runner",
     "probes": [
         "probeGFX",
         "probeNetwork"
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/color/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-opacity/color/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json
index 7e01e8e930..7e01e8e930 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/image/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-opacity/image/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json b/metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
index 12f80d05a3..12f80d05a3 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-opacity/overlay/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
index 89a3b9090c..89a3b9090c 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/@2x/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json
index cdb304a90f..cdb304a90f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/missing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
index 77a63a3f58..77a63a3f58 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/pitch/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/rotated/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json b/metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/background-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json
index f5baf3924a..f5baf3924a 100644
--- a/metrics/next-android-render-test-runner/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/basic-v9/z0/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json
index bc753ead90..bc753ead90 100644
--- a/metrics/next-android-render-test-runner/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/bright-v9/z0/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json
index 3e29447ea9..3e29447ea9 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/blending/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
index b9307738e0..b9307738e0 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
index 742ac68192..742ac68192 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json b/metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/blending/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/circle-translate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 9dd47aeeeb..9dd47aeeeb 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index f460f1be9e..f460f1be9e 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 94161dda76..94161dda76 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index 6cdf449a0c..6cdf449a0c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 11aca40c02..11aca40c02 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ffa..6ed2f71ffa 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39e..bc4caba39e 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d0..e0337338d0 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-lines/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe383..d9e4fbe383 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca802..d4438ca802 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
index 29bd850670..29bd850670 100644
--- a/metrics/next-android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/debug/collision-pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json b/metrics/android-render-test-runner/render-tests/empty/empty/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/empty/empty/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/empty/empty/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json
index 705eaa2c4e..705eaa2c4e 100644
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/extent/1024-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json
index b0ad84b7b6..b0ad84b7b6 100644
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/extent/1024-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
index b5f9604d8e..b5f9604d8e 100644
--- a/metrics/next-android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/extent/1024-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/feature-state/data-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json b/metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/feature-state/vector-source/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json b/metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-antialias/false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/multiply/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/opacity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json
index 8ae66783ec..8ae66783ec 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
index 424e3e22c8..424e3e22c8 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 5c12ec1c1e..5c12ec1c1e 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index e3548b740c..e3548b740c 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index c272c32be1..c272c32be1 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
index e7b07b6e25..e7b07b6e25 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
index 808337bb3d..808337bb3d 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index 6b55634a1c..6b55634a1c 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
index f9de3e6600..f9de3e6600 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
index 0923fe04bb..0923fe04bb 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index 0800242842..0800242842 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
index c3e66bb650..c3e66bb650 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index 0bf5f29188..0bf5f29188 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
index 51c11b8e4a..51c11b8e4a 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
index 5b0f25c103..5b0f25c103 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 714f677bd6..714f677bd6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
index 07184a47f6..07184a47f6 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/missing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
index 0b64b9c6e2..0b64b9c6e2 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index 8107ea6575..8107ea6575 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
index a3bacd4632..a3bacd4632 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-translate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/fill-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json b/metrics/android-render-test-runner/render-tests/filter/equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/filter/equality/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/filter/equality/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json b/metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/filter/legacy-equality/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json b/metrics/android-render-test-runner/render-tests/filter/none/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/filter/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/filter/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
index 921bb22529..921bb22529 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json
index e4de306451..e4de306451 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/clustered/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/clustered/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/external-feature/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
index c050c4e8ce..c050c4e8ce 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/external-invalid/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/external-linestring/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
index c35eb5d526..c35eb5d526 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/external-malformed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
index 92d02167a9..92d02167a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
index 0d433cec13..0d433cec13 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-feature/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
index 87bafb2c59..87bafb2c59 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
index b947079d6b..b947079d6b 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
index 676dd680b3..676dd680b3 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
index fb542cead0..fb542cead0 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
index d01fbee184..d01fbee184 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
index 5b035beb41..5b035beb41 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
index c031604857..c031604857 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/missing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/missing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
index f1bf8426ca..f1bf8426ca 100644
--- a/metrics/next-android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-color/expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
index 08b7ca1c86..08b7ca1c86 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
index e12b800462..e12b800462 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-weight/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
index 3c0b3e0c7f..3c0b3e0c7f 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json b/metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0af7981529..0af7981529 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/center/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
index 06c60d080b..06c60d080b 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json b/metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-anchor/top/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json
index 4c633b4237..4c633b4237 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
index 77eaf96958..77eaf96958 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-width/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-width/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index 9689f98407..9689f98407 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/image-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/stretchable/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/stretchable/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json b/metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-image/token/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-image/token/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
index ef86c597d3..ef86c597d3 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-offset/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-offset/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
index 0760437163..0760437163 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json b/metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
index f1cb4ead5f..f1cb4ead5f 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46a..6d7c07c46a 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
index 6e8125cf62..6e8125cf62 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
index 18164e288a..18164e288a 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index 533e640ba8..533e640ba8 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 27c166e4fa..27c166e4fa 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
index f8a34973b4..f8a34973b4 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/both/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-both/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/height/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
index f879907a01..f879907a01 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
index 37cfb3b5fd..37cfb3b5fd 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
index 52972bf07e..52972bf07e 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
index 5bec05e584..5bec05e584 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
index 0cd910a99a..0cd910a99a 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
index 3e848e8533..3e848e8533 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
index 6048fc7e0b..6048fc7e0b 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 3c52c61f52..3c52c61f52 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json b/metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-text-fit/width/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-translate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/icon-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json b/metrics/android-render-test-runner/render-tests/image/default/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/image/pitched/metrics.json
index 40cff205c7..40cff205c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-brightness/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-contrast/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-opacity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-resampling/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-saturation/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json b/metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-android-render-test-runner/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/image/raster-visibility/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json b/metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/is-supported-script/filter/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json b/metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
index f7dd7ee4c0..f7dd7ee4c0 100644
--- a/metrics/next-android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/is-supported-script/layout/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-blur/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-blur/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-blur/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-blur/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/butt/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-cap/butt/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json
index b8fd663961..b8fd663961 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/round/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-cap/round/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json b/metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-cap/square/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-cap/square/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
index 870d30daeb..870d30daeb 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json
index b8b502e177..b8b502e177 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json
index f116462d86..f116462d86 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
index a687132530..a687132530 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 45bcb8f0af..45bcb8f0af 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
index 22bd3284bd..22bd3284bd 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
index 747a2afbe1..747a2afbe1 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
index 5e55b94da8..5e55b94da8 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/slant/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
index b4f03708c4..b4f03708c4 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gap-width/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gap-width/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gap-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json b/metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gradient/gradient/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json b/metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-gradient/translucent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/bevel/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/bevel/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/default/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/miter/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/miter/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
index c43da97741..c43da97741 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json
index 58f534192f..58f534192f 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/round-transparent/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-join/round/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-join/round/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-join/round/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-offset/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-offset/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-offset/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-offset/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json b/metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
index 49ecdaab98..49ecdaab98 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
index 5163e6758e..5163e6758e 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/@2x/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
index d108f774d1..d108f774d1 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/pitch/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
index 136c147615..136c147615 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
index fbbd2176a9..fbbd2176a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pitch/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
index 12a7598851..12a7598851 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json
index 8e3ab38a23..8e3ab38a23 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-triangulation/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json b/metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json
index 9d54981560..9d54981560 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-triangulation/round/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json
index e66ff128ba..e66ff128ba 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
index b93dcb8232..b93dcb8232 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
index c6cefecd17..c6cefecd17 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json b/metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json
index 2712b0b4fe..2712b0b4fe 100644
--- a/metrics/next-android-render-test-runner/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/line-width/zero-width/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
index bf9483fb78..bf9483fb78 100644
--- a/metrics/next-android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json
index 290ed6328f..290ed6328f 100644
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/static/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/map-mode/static/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad897..199ebad897 100644
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json b/metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json
index 3510a6a2db..3510a6a2db 100644
--- a/metrics/next-android-render-test-runner/render-tests/map-mode/tile/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/map-mode/tile/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json b/metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json b/metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-android-render-test-runner/render-tests/projection/axonometric/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/projection/axonometric/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json b/metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-android-render-test-runner/render-tests/projection/perspective/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/projection/perspective/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json b/metrics/android-render-test-runner/render-tests/projection/skew/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-android-render-test-runner/render-tests/projection/skew/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/projection/skew/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json
index 08d8297db8..08d8297db8 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-alpha/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-brightness/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-brightness/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-brightness/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-contrast/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-contrast/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-contrast/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json b/metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json b/metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json b/metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json
index 4bd248b8fa..4bd248b8fa 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-loading/missing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
index 12c856a698..12c856a698 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
index c0ad63d409..c0ad63d409 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-resampling/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-resampling/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-resampling/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-rotation/0/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-rotation/180/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-rotation/270/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json
index b4c21ad5c9..b4c21ad5c9 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-rotation/45/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json b/metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-rotation/90/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-saturation/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-saturation/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json b/metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-saturation/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json
index db64850e38..db64850e38 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/raster-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json
index f1142e011c..f1142e011c 100644
--- a/metrics/next-android-render-test-runner/render-tests/real-world/nepal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/real-world/nepal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json
index 45badb494a..45badb494a 100644
--- a/metrics/next-android-render-test-runner/render-tests/real-world/norway/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/real-world/norway/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json b/metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json
index 8c183cc9f3..8c183cc9f3 100644
--- a/metrics/next-android-render-test-runner/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/real-world/uruguay/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
index 96bd9fd98f..96bd9fd98f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2305/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index a48098b4aa..a48098b4aa 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index c527b4e09d..c527b4e09d 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index 7d15d2a7ad..7d15d2a7ad 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index 2052d5d52e..2052d5d52e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index bcc2a3f74f..bcc2a3f74f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 09d52d402e..09d52d402e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index 65f07ee533..65f07ee533 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index c217fdfc61..c217fdfc61 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 3520563149..3520563149 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index bc237525bb..bc237525bb 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 16485ab8b4..16485ab8b4 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 0500eb4873..0500eb4873 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index a01add499e..a01add499e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index f9443ff76e..f9443ff76e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index 485b59ab36..485b59ab36 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 3468eac0f2..3468eac0f2 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index ba3ca00114..ba3ca00114 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b26951..b3e8b26951 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 54f55f390d..54f55f390d 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index 77e26663ad..77e26663ad 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 2a11129cdd..2a11129cdd 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index e78c748008..e78c748008 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 5e66f07df0..5e66f07df0 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index 20fa03d324..20fa03d324 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 6b144b9538..6b144b9538 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index 63e089963e..63e089963e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 4ab1b5696c..4ab1b5696c 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 7ce4c13248..7ce4c13248 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 2ce8e21873..2ce8e21873 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f8..25b998e4f8 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index 9c7a3359c2..9c7a3359c2 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index 7b8e778406..7b8e778406 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index f8108ef92f..f8108ef92f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 64d5fea021..64d5fea021 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 89aa855d36..89aa855d36 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c8..2e13bfe1c8 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index 693f787042..693f787042 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 2e92924579..2e92924579 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/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/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
index a5407ceb76..a5407ceb76 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index a80aa837e4..a80aa837e4 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index 0be45de845..0be45de845 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 89ccfdbed1..89ccfdbed1 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index 98442c7f49..98442c7f49 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index 5cb2eb8428..5cb2eb8428 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index fb4e5552f7..fb4e5552f7 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index ad0cf8a267..ad0cf8a267 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index daa3b24ba1..daa3b24ba1 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index 38eab4e78e..38eab4e78e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index 2bd3523e27..2bd3523e27 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index 16c62d33f5..16c62d33f5 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 4e5b247b07..4e5b247b07 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index 7f54e74803..7f54e74803 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 6de6aa8e28..6de6aa8e28 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 662a5ca35c..662a5ca35c 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index eb891b578e..eb891b578e 100644
--- a/metrics/next-android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json b/metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-android-render-test-runner/render-tests/retina-raster/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/retina-raster/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
index 7b309facc7..7b309facc7 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
index ac4b3251ff..ac4b3251ff 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
index 9b2e396f8e..9b2e396f8e 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index c4c12ce6cc..c4c12ce6cc 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index ded111d5db..ded111d5db 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index 7c2bcc88a9..7c2bcc88a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 23b829f168..23b829f168 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 47108b29bc..47108b29bc 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index 9d89d5f2f3..9d89d5f2f3 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
index dea2cb3857..dea2cb3857 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-glyphs/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index e0426e7b51..e0426e7b51 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json b/metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
index b3dedd944d..b3dedd944d 100644
--- a/metrics/next-android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/satellite-v9/z0/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
index 04af83427d..04af83427d 100644
--- a/metrics/next-android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
index 2bdb228c52..2bdb228c52 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc9..28402a2cc9 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
index daaadcdba2..daaadcdba2 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
index 95aa395c60..95aa395c60 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-placement/point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
index 6c810abb8a..6c810abb8a 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
index 7298ff45e0..7298ff45e0 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index c501cdfe8b..c501cdfe8b 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
index b6cfd840ae..b6cfd840ae 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
index 23e6cccadb..23e6cccadb 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
index 1de5e049d8..1de5e049d8 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-z-order/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/bottom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/center/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/center/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
index 6d769f5648..6d769f5648 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/top-left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/top-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json b/metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-anchor/top/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-anchor/top/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
index 932066a29f..932066a29f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
index ed9a135831..ed9a135831 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
index 8ebd514b42..8ebd514b42 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-arabic/line-break/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
index 987740be5e..987740be5e 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json
index 60c3ad345f..60c3ad345f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
index 526f4071d8..526f4071d8 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
index 62c000b290..62c000b290 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
index a02d067247..a02d067247 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
index 137e66bf14..137e66bf14 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index a56a73a714..a56a73a714 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
index 197cdb9b50..197cdb9b50 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 4b81074408..4b81074408 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
index 52b1978f29..52b1978f29 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-images/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
index 089da63a88..089da63a88 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 128115bae7..128115bae7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 0f1b65a6db..0f1b65a6db 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
index 1640b2b40b..1640b2b40b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json
index 883429ed73..883429ed73 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/formatted/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/formatted/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json
index f20b89d82f..f20b89d82f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json b/metrics/android-render-test-runner/render-tests/text-field/token/metrics.json
index fa46462cc5..fa46462cc5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-field/token/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-field/token/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-font/camera-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json
index 46fdec9d05..46fdec9d05 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-font/chinese/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-font/chinese/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json
index aac1bbcfbc..aac1bbcfbc 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-font/data-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-font/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-font/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-blur/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-blur/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-color/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-color/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-color/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
index 47cea62594..47cea62594 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-width/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-width/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json
index 0f7801b2e4..0f7801b2e4 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/auto/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-justify/auto/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-justify/left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json
index 5c1e774f37..5c1e774f37 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-justify/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json b/metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-justify/right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-justify/right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 1a478f9857..1a478f9857 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index 2412b1cc57..2412b1cc57 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
index 97d7f27021..97d7f27021 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index fd1ea83213..fd1ea83213 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-line-height/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
index 9551aabb14..9551aabb14 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
index 2ad59dd984..2ad59dd984 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-angle/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
index 4c0301c08d..4c0301c08d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index e6477234cc..e6477234cc 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json
index 05279818ae..05279818ae 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
index 8eef9a4166..8eef9a4166 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
index b95ec5af3c..b95ec5af3c 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
index 563004e912..563004e912 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json
index 384ce4dadb..384ce4dadb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-offset/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-opacity/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-opacity/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-opacity/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
index 6734d0b046..6734d0b046 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-opacity/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index d05556cd14..d05556cd14 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index edd93c6655..edd93c6655 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json b/metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
index 0859331916..0859331916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
index be4621cd93..be4621cd93 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/composite-expression/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
index 5c85a420f3..5c85a420f3 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/composite-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/function/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-size/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-size/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
index 05d7f57555..05d7f57555 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
index 2bf7d11354..2bf7d11354 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-transform/lowercase/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json
index 94f6c3ccd6..94f6c3ccd6 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-transform/property-function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json b/metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
index ecb7316699..ecb7316699 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-transform/uppercase/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-translate/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/function/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-translate/function/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json b/metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-translate/literal/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-translate/literal/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 9953c2ea9e..9953c2ea9e 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index dca033517b..dca033517b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc632922..a7cc632922 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
index 806d886e75..806d886e75 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c346277..3a2c346277 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index c4efa5911f..c4efa5911f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131f..415dfc131f 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
index 9dca847cbb..9dca847cbb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
index a8acd89723..a8acd89723 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index 40b67f1445..40b67f1445 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index 74f5df99b3..74f5df99b3 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json b/metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-visibility/none/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-visibility/none/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json b/metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json
index d7ff42c127..d7ff42c127 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-visibility/visible/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 4da17ca35c..4da17ca35c 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
index 4c978ab6c2..4c978ab6c2 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
index 8c2cc0dbcb..8c2cc0dbcb 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
index caf18baec7..caf18baec7 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index 23e8621fe3..23e8621fe3 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index eabb4022be..eabb4022be 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 25fb8b4d1e..25fb8b4d1e 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index d8ccbe177b..d8ccbe177b 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/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/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 632a29ad17..632a29ad17 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 5cf22c6b3e..5cf22c6b3e 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index ad6e567fda..ad6e567fda 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index c1486937e1..c1486937e1 100644
--- a/metrics/next-android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json b/metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json b/metrics/android-render-test-runner/render-tests/tms/tms/metrics.json
index f7ca11c232..f7ca11c232 100644
--- a/metrics/next-android-render-test-runner/render-tests/tms/tms/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/tms/tms/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-history/in/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-history/in/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-history/out/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-history/out/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/above/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
index d11ea20c71..d11ea20c71 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/below/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
index ed48714735..ed48714735 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
index b51667187e..b51667187e 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
index ca6ff8e333..ca6ff8e333 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoomed-fill/default/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/android-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/metrics/binary-size.json b/metrics/binary-size.json
new file mode 100644
index 0000000000..1ffbfb56d8
--- /dev/null
+++ b/metrics/binary-size.json
@@ -0,0 +1,4 @@
+{
+    "base_test_path": "binary-size",
+    "metric_path": "binary-size"
+}
diff --git a/metrics/next-binary-size/android-arm64-v8a/expected.png b/metrics/binary-size/android-arm64-v8a/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/android-arm64-v8a/expected.png
+++ b/metrics/binary-size/android-arm64-v8a/expected.png
diff --git a/metrics/next-binary-size/android-arm64-v8a/metrics.json b/metrics/binary-size/android-arm64-v8a/metrics.json
index 8daa544846..946e33661a 100644
--- a/metrics/next-binary-size/android-arm64-v8a/metrics.json
+++ b/metrics/binary-size/android-arm64-v8a/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-arm64-v8a",
-            "/tmp/attach/install/next-android-arm64-v8a-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-arm64-v8a-release/lib/libmapbox-gl.so",
             1930061
         ]
     ]
diff --git a/metrics/next-binary-size/android-arm64-v8a/style.json b/metrics/binary-size/android-arm64-v8a/style.json
index 77b7d38860..dd883d579b 100644
--- a/metrics/next-binary-size/android-arm64-v8a/style.json
+++ b/metrics/binary-size/android-arm64-v8a/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-arm64-v8a", "/tmp/attach/install/next-android-arm64-v8a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-arm64-v8a", "/tmp/attach/install/android-arm64-v8a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/next-binary-size/android-armeabi-v7a/expected.png b/metrics/binary-size/android-armeabi-v7a/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/android-armeabi-v7a/expected.png
+++ b/metrics/binary-size/android-armeabi-v7a/expected.png
diff --git a/metrics/next-binary-size/android-armeabi-v7a/metrics.json b/metrics/binary-size/android-armeabi-v7a/metrics.json
index 6874e34734..9a5afb56da 100644
--- a/metrics/next-binary-size/android-armeabi-v7a/metrics.json
+++ b/metrics/binary-size/android-armeabi-v7a/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-armeabi-v7a",
-            "/tmp/attach/install/next-android-armeabi-v7a-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-armeabi-v7a-release/lib/libmapbox-gl.so",
             1624848
         ]
     ]
diff --git a/metrics/next-binary-size/android-armeabi-v7a/style.json b/metrics/binary-size/android-armeabi-v7a/style.json
index 1c737724f2..66e1fc1b66 100644
--- a/metrics/next-binary-size/android-armeabi-v7a/style.json
+++ b/metrics/binary-size/android-armeabi-v7a/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-armeabi-v7a", "/tmp/attach/install/next-android-armeabi-v7a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-armeabi-v7a", "/tmp/attach/install/android-armeabi-v7a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/next-binary-size/android-x86/expected.png b/metrics/binary-size/android-x86/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/android-x86/expected.png
+++ b/metrics/binary-size/android-x86/expected.png
diff --git a/metrics/next-binary-size/android-x86/metrics.json b/metrics/binary-size/android-x86/metrics.json
index 30de0f64a5..6606eb920b 100644
--- a/metrics/next-binary-size/android-x86/metrics.json
+++ b/metrics/binary-size/android-x86/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-x86",
-            "/tmp/attach/install/next-android-x86-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-x86-release/lib/libmapbox-gl.so",
             1953751
         ]
     ]
diff --git a/metrics/next-binary-size/android-x86/style.json b/metrics/binary-size/android-x86/style.json
index 16c74ea763..a2eebe4fec 100644
--- a/metrics/next-binary-size/android-x86/style.json
+++ b/metrics/binary-size/android-x86/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-x86", "/tmp/attach/install/next-android-x86-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-x86", "/tmp/attach/install/android-x86-release/lib/libmapbox-gl.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/next-binary-size/android-x86_64/expected.png b/metrics/binary-size/android-x86_64/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/android-x86_64/expected.png
+++ b/metrics/binary-size/android-x86_64/expected.png
diff --git a/metrics/next-binary-size/android-x86_64/metrics.json b/metrics/binary-size/android-x86_64/metrics.json
index d16b5af751..b64b151ceb 100644
--- a/metrics/next-binary-size/android-x86_64/metrics.json
+++ b/metrics/binary-size/android-x86_64/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-x86_64",
-            "/tmp/attach/install/next-android-x86_64-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-x86_64-release/lib/libmapbox-gl.so",
             1966850
         ]
     ]
diff --git a/metrics/next-binary-size/android-x86_64/style.json b/metrics/binary-size/android-x86_64/style.json
index 5aeca52013..a27af4bd66 100644
--- a/metrics/next-binary-size/android-x86_64/style.json
+++ b/metrics/binary-size/android-x86_64/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-x86_64", "/tmp/attach/install/next-android-x86_64-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-x86_64", "/tmp/attach/install/android-x86_64-release/lib/libmapbox-gl.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/next-binary-size/linux-clang8/expected.png b/metrics/binary-size/linux-clang8/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/linux-clang8/expected.png
+++ b/metrics/binary-size/linux-clang8/expected.png
diff --git a/metrics/binary-size/linux-clang8/metrics.json b/metrics/binary-size/linux-clang8/metrics.json
new file mode 100644
index 0000000000..6f16bb1b15
--- /dev/null
+++ b/metrics/binary-size/linux-clang8/metrics.json
@@ -0,0 +1,19 @@
+{
+    "file-size": [
+        [
+            "mbgl-glfw",
+            "/tmp/attach/install/linux-clang8-release/bin/mbgl-glfw",
+            6507720
+        ],
+        [
+            "mbgl-offline",
+            "/tmp/attach/install/linux-clang8-release/bin/mbgl-offline",
+            5774024
+        ],
+        [
+            "mbgl-render",
+            "/tmp/attach/install/linux-clang8-release/bin/mbgl-render",
+            6409144
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/binary-size/linux-clang8/style.json b/metrics/binary-size/linux-clang8/style.json
new file mode 100644
index 0000000000..15ec600201
--- /dev/null
+++ b/metrics/binary-size/linux-clang8/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/linux-clang8-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/linux-clang8-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/tmp/attach/install/linux-clang8-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/next-binary-size/linux-gcc8/expected.png b/metrics/binary-size/linux-gcc8/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/linux-gcc8/expected.png
+++ b/metrics/binary-size/linux-gcc8/expected.png
diff --git a/metrics/next-binary-size/linux-gcc8/metrics.json b/metrics/binary-size/linux-gcc8/metrics.json
index d46a45d2ba..b277fbf770 100644
--- a/metrics/next-binary-size/linux-gcc8/metrics.json
+++ b/metrics/binary-size/linux-gcc8/metrics.json
@@ -2,17 +2,17 @@
     "file-size": [
         [
             "mbgl-glfw",
-            "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-glfw",
+            "/tmp/attach/install/linux-gcc8-release/bin/mbgl-glfw",
             7475528
         ],
         [
             "mbgl-offline",
-            "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-offline",
+            "/tmp/attach/install/linux-gcc8-release/bin/mbgl-offline",
             6570216
         ],
         [
             "mbgl-render",
-            "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-render",
+            "/tmp/attach/install/linux-gcc8-release/bin/mbgl-render",
             7360840
         ]
     ]
diff --git a/metrics/binary-size/linux-gcc8/style.json b/metrics/binary-size/linux-gcc8/style.json
new file mode 100644
index 0000000000..4e205a2854
--- /dev/null
+++ b/metrics/binary-size/linux-gcc8/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/linux-gcc8-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/linux-gcc8-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/tmp/attach/install/linux-gcc8-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/next-binary-size/macos-xcode11/expected.png b/metrics/binary-size/macos-xcode11/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/next-binary-size/macos-xcode11/expected.png
+++ b/metrics/binary-size/macos-xcode11/expected.png
diff --git a/metrics/binary-size/macos-xcode11/metrics.json b/metrics/binary-size/macos-xcode11/metrics.json
new file mode 100644
index 0000000000..dc74d1c455
--- /dev/null
+++ b/metrics/binary-size/macos-xcode11/metrics.json
@@ -0,0 +1,19 @@
+{
+    "file-size": [
+        [
+            "mbgl-glfw",
+            "/tmp/attach/install/macos-xcode11-release/bin/mbgl-glfw",
+            5562556
+        ],
+        [
+            "mbgl-offline",
+            "/tmp/attach/install/macos-xcode11-release/bin/mbgl-offline",
+            5427032
+        ],
+        [
+            "mbgl-render",
+            "/tmp/attach/install/macos-xcode11-release/bin/mbgl-render",
+            5477244
+        ]
+    ]
+}
diff --git a/metrics/binary-size/macos-xcode11/style.json b/metrics/binary-size/macos-xcode11/style.json
new file mode 100644
index 0000000000..29e381f9cb
--- /dev/null
+++ b/metrics/binary-size/macos-xcode11/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/macos-xcode11-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/macos-xcode11-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/tmp/attach/install/macos-xcode11-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/next-ios-render-test-runner-metrics.json b/metrics/ios-render-test-runner-metrics.json
index 042e9ec445..fc0ee5332f 100644
--- a/metrics/next-ios-render-test-runner-metrics.json
+++ b/metrics/ios-render-test-runner-metrics.json
@@ -10,5 +10,5 @@
         "ignores/platform-macos.json",
         "ignores/platform-ios.json"
     ],
-    "metric_path": "next-ios-render-test-runner"
+    "metric_path": "ios-render-test-runner"
 }
\ No newline at end of file
diff --git a/metrics/next-ios-render-test-runner-style.json b/metrics/ios-render-test-runner-style.json
index cc40c69206..432edb11a2 100644
--- a/metrics/next-ios-render-test-runner-style.json
+++ b/metrics/ios-render-test-runner-style.json
@@ -10,7 +10,7 @@
         "ignores/platform-macos.json",
         "ignores/platform-ios.json"
     ],
-    "metric_path": "next-ios-render-test-runner",
+    "metric_path": "ios-render-test-runner",
     "probes": [
         "probeGFX",
         "probeNetwork"
diff --git a/metrics/next-ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json
index 274d5cd7c8..274d5cd7c8 100644
--- a/metrics/next-ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json
+++ b/metrics/ios-render-test-runner/probes/gfx/pass-double-probe/metrics.json
diff --git a/metrics/next-ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json
index 50f2a2721a..50f2a2721a 100644
--- a/metrics/next-ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json
+++ b/metrics/ios-render-test-runner/probes/gfx/pass-probe-reset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/probes/gfx/pass/metrics.json b/metrics/ios-render-test-runner/probes/gfx/pass/metrics.json
index 930d8dcf50..930d8dcf50 100644
--- a/metrics/next-ios-render-test-runner/probes/gfx/pass/metrics.json
+++ b/metrics/ios-render-test-runner/probes/gfx/pass/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-opacity/color/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-opacity/color/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-opacity/color/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-opacity/image/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json
index 7e01e8e930..7e01e8e930 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-opacity/image/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-opacity/image/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json b/metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json
index 12f80d05a3..12f80d05a3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-opacity/overlay/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json
index 89a3b9090c..89a3b9090c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/@2x/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json
index cdb304a90f..cdb304a90f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/missing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json
index 77a63a3f58..77a63a3f58 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/pitch/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/rotated/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-pattern/zoomed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/background-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/background-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json
index f5baf3924a..f5baf3924a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/basic-v9/z0/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/bright-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json
index bc753ead90..bc753ead90 100644
--- a/metrics/next-ios-render-test-runner/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/bright-v9/z0/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/blending/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json
index 3e29447ea9..3e29447ea9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/blending/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/linestring/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
index b9307738e0..b9307738e0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
index 742ac68192..742ac68192 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/point/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-geometry/polygon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/blending/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/circle-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/circle-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 9dd47aeeeb..9dd47aeeeb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index f460f1be9e..f460f1be9e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 94161dda76..94161dda76 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index 6cdf449a0c..6cdf449a0c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 11aca40c02..11aca40c02 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ffa..6ed2f71ffa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39e..bc4caba39e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d0..e0337338d0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-lines/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe383..d9e4fbe383 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca802..d4438ca802 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json
index 29bd850670..29bd850670 100644
--- a/metrics/next-ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/debug/collision-pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/empty/empty/metrics.json b/metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/empty/empty/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/empty/empty/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/extent/1024-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json
index 705eaa2c4e..705eaa2c4e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/extent/1024-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/extent/1024-line/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json
index b0ad84b7b6..b0ad84b7b6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/extent/1024-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/extent/1024-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json
index b5f9604d8e..b5f9604d8e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/extent/1024-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/feature-state/composite-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/feature-state/data-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json b/metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/feature-state/vector-source/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-antialias/false/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-antialias/false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/multiply/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json
index 8ae66783ec..8ae66783ec 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
index 424e3e22c8..424e3e22c8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 5c12ec1c1e..5c12ec1c1e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index e3548b740c..e3548b740c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index c272c32be1..c272c32be1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
index e7b07b6e25..e7b07b6e25 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
index 808337bb3d..808337bb3d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index 6b55634a1c..6b55634a1c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
index f9de3e6600..f9de3e6600 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
index 0923fe04bb..0923fe04bb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
index cc32c1d107..cc32c1d107 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index 0800242842..0800242842 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
index c3e66bb650..c3e66bb650 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index 0bf5f29188..0bf5f29188 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
index 51c11b8e4a..51c11b8e4a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/@2x/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
index 5b0f25c103..5b0f25c103 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 714f677bd6..714f677bd6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json
index 07184a47f6..07184a47f6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/missing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
index 0b64b9c6e2..0b64b9c6e2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index 8107ea6575..8107ea6575 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-pattern/zoomed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
index a3bacd4632..a3bacd4632 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/fill-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/filter/equality/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/filter/equality/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/filter/equality/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/filter/legacy-equality/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/filter/none/metrics.json b/metrics/ios-render-test-runner/render-tests/filter/none/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/filter/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/filter/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
index 921bb22529..921bb22529 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/clustered-properties/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/clustered/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json
index e4de306451..e4de306451 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/clustered/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/clustered/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/external-feature/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/external-feature/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json
index c050c4e8ce..c050c4e8ce 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/external-invalid/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/external-linestring/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json
index c35eb5d526..c35eb5d526 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/external-malformed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
index 92d02167a9..92d02167a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json
index 0d433cec13..0d433cec13 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-feature/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-invalid/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
index 87bafb2c59..87bafb2c59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
index b947079d6b..b947079d6b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-malformed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
index 676dd680b3..676dd680b3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
index fb542cead0..fb542cead0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
index d01fbee184..d01fbee184 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
index 5b035beb41..5b035beb41 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
index c031604857..c031604857 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/missing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/missing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
index f1bf8426ca..f1bf8426ca 100644
--- a/metrics/next-ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-color/expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
index 08b7ca1c86..08b7ca1c86 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
index e12b800462..e12b800462 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-weight/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
index 3c0b3e0c7f..3c0b3e0c7f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/heatmap-weight/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0af7981529..0af7981529 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/bottom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/center/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/center/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
index 06c60d080b..06c60d080b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/top-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-anchor/top/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json
index 4c633b4237..4c633b4237 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
index 77eaf96958..77eaf96958 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-width/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-width/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index 9689f98407..9689f98407 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/image-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable-content/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/stretchable/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-image/token/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-image/token/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-image/token/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
index ef86c597d3..ef86c597d3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-offset/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-offset/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
index 0760437163..0760437163 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-opacity/text-only/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
index f1cb4ead5f..f1cb4ead5f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotate/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46a..6d7c07c46a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
index 6e8125cf62..6e8125cf62 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
index 18164e288a..18164e288a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index 533e640ba8..533e640ba8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 27c166e4fa..27c166e4fa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
index f8a34973b4..f8a34973b4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/both/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/height/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
index f879907a01..f879907a01 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
index 37cfb3b5fd..37cfb3b5fd 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
index 52972bf07e..52972bf07e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
index 5bec05e584..5bec05e584 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-nine-part/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
index 0cd910a99a..0cd910a99a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-three-part/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
index 3e848e8533..3e848e8533 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-two-part/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
index 6048fc7e0b..6048fc7e0b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/stretch-underscale/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 3c52c61f52..3c52c61f52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-text-fit/width/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/icon-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/default/metrics.json b/metrics/ios-render-test-runner/render-tests/image/default/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json
index 40cff205c7..40cff205c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-brightness/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-brightness/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-contrast/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-contrast/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-resampling/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-resampling/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-saturation/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-saturation/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/image/raster-visibility/metrics.json b/metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/image/raster-visibility/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json b/metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/is-supported-script/filter/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json b/metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json
index f7dd7ee4c0..f7dd7ee4c0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/is-supported-script/layout/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-blur/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-blur/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-blur/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-blur/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-blur/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-blur/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-blur/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-cap/butt/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-cap/butt/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-cap/butt/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-cap/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json
index b8fd663961..b8fd663961 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-cap/round/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-cap/round/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-cap/square/metrics.json b/metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-cap/square/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-cap/square/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
index 870d30daeb..870d30daeb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-color/property-function-identity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json
index b8b502e177..b8b502e177 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json
index f116462d86..f116462d86 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
index a687132530..a687132530 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 45bcb8f0af..45bcb8f0af 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
index 22bd3284bd..22bd3284bd 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
index 747a2afbe1..747a2afbe1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json
index 5e55b94da8..5e55b94da8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/slant/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
index b4f03708c4..b4f03708c4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gap-width/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gap-width/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gap-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gap-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gradient/gradient/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-gradient/translucent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/bevel/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/bevel/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/bevel/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/miter-transparent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/miter/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/miter/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/miter/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
index c43da97741..c43da97741 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json
index 58f534192f..58f534192f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/round-transparent/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-join/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-join/round/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-join/round/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-offset/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-offset/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-offset/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-offset/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-offset/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-offset/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-offset/literal-negative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-offset/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-offset/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-offset/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json b/metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
index 49ecdaab98..49ecdaab98 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-opacity/step-curve/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json
index 5163e6758e..5163e6758e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/@2x/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/opacity/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json
index d108f774d1..d108f774d1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/pitch/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json
index 136c147615..136c147615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
index fbbd2176a9..fbbd2176a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/step-curve/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pitch/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pitch/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pitch/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch0/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch15/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pitch/pitch30/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json
index 12a7598851..12a7598851 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-sort-key/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-triangulation/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json
index 8e3ab38a23..8e3ab38a23 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-triangulation/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-triangulation/round/metrics.json b/metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json
index 9d54981560..9d54981560 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-triangulation/round/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json
index e66ff128ba..e66ff128ba 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
index b93dcb8232..b93dcb8232 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/very-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
index c6cefecd17..c6cefecd17 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/zero-width-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/line-width/zero-width/metrics.json b/metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json
index 2712b0b4fe..2712b0b4fe 100644
--- a/metrics/next-ios-render-test-runner/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/line-width/zero-width/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
index bf9483fb78..bf9483fb78 100644
--- a/metrics/next-ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/map-mode/static/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json
index 290ed6328f..290ed6328f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/map-mode/static/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/map-mode/static/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad897..199ebad897 100644
--- a/metrics/next-ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/map-mode/tile/metrics.json b/metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json
index 3510a6a2db..3510a6a2db 100644
--- a/metrics/next-ios-render-test-runner/render-tests/map-mode/tile/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/map-mode/tile/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/projection/axonometric/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-ios-render-test-runner/render-tests/projection/axonometric/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/projection/axonometric/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/projection/perspective/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-ios-render-test-runner/render-tests/projection/perspective/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/projection/perspective/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/projection/skew/metrics.json b/metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-ios-render-test-runner/render-tests/projection/skew/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/projection/skew/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-alpha/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json
index 08d8297db8..08d8297db8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-alpha/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-brightness/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-brightness/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-brightness/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-contrast/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-contrast/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-contrast/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-extent/minzoom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-loading/missing/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json
index 4bd248b8fa..4bd248b8fa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-loading/missing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
index 12c856a698..12c856a698 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping-vector/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
index c0ad63d409..c0ad63d409 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-masking/overlapping/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-resampling/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-resampling/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-resampling/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/0/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-rotation/0/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/180/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-rotation/180/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/270/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-rotation/270/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/45/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json
index b4c21ad5c9..b4c21ad5c9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-rotation/45/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/90/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-rotation/90/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/default/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-saturation/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/function/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-saturation/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-saturation/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json
index db64850e38..db64850e38 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/raster-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/real-world/nepal/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json
index f1142e011c..f1142e011c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/real-world/nepal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/real-world/nepal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/real-world/norway/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json
index 45badb494a..45badb494a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/real-world/norway/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/real-world/norway/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/real-world/uruguay/metrics.json b/metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json
index 8c183cc9f3..8c183cc9f3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/real-world/uruguay/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index a48098b4aa..a48098b4aa 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index c527b4e09d..c527b4e09d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index 7d15d2a7ad..7d15d2a7ad 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index 2052d5d52e..2052d5d52e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index bcc2a3f74f..bcc2a3f74f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 09d52d402e..09d52d402e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index 65f07ee533..65f07ee533 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index c217fdfc61..c217fdfc61 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 3520563149..3520563149 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index bc237525bb..bc237525bb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 16485ab8b4..16485ab8b4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 0500eb4873..0500eb4873 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index a01add499e..a01add499e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index f9443ff76e..f9443ff76e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index 485b59ab36..485b59ab36 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 3468eac0f2..3468eac0f2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index ba3ca00114..ba3ca00114 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b26951..b3e8b26951 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 54f55f390d..54f55f390d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index 77e26663ad..77e26663ad 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 2a11129cdd..2a11129cdd 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index e78c748008..e78c748008 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 5e66f07df0..5e66f07df0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index 20fa03d324..20fa03d324 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 6b144b9538..6b144b9538 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index 63e089963e..63e089963e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 4ab1b5696c..4ab1b5696c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 7ce4c13248..7ce4c13248 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 2ce8e21873..2ce8e21873 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f8..25b998e4f8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index 9c7a3359c2..9c7a3359c2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index 7b8e778406..7b8e778406 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index f8108ef92f..f8108ef92f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 64d5fea021..64d5fea021 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 89aa855d36..89aa855d36 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c8..2e13bfe1c8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index 693f787042..693f787042 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 2e92924579..2e92924579 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#8273/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
index a5407ceb76..a5407ceb76 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-js#9009/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index a80aa837e4..a80aa837e4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index 0be45de845..0be45de845 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 89ccfdbed1..89ccfdbed1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index 98442c7f49..98442c7f49 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index 5cb2eb8428..5cb2eb8428 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index fb4e5552f7..fb4e5552f7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index ad0cf8a267..ad0cf8a267 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index daa3b24ba1..daa3b24ba1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index 38eab4e78e..38eab4e78e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index 2bd3523e27..2bd3523e27 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index 16c62d33f5..16c62d33f5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 4e5b247b07..4e5b247b07 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index 7f54e74803..7f54e74803 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 6de6aa8e28..6de6aa8e28 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 662a5ca35c..662a5ca35c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index eb891b578e..eb891b578e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/retina-raster/default/metrics.json b/metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/retina-raster/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/retina-raster/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
index 7b309facc7..7b309facc7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
index ac4b3251ff..ac4b3251ff 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
index 9b2e396f8e..9b2e396f8e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index c4c12ce6cc..c4c12ce6cc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index ded111d5db..ded111d5db 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index 7c2bcc88a9..7c2bcc88a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 23b829f168..23b829f168 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 47108b29bc..47108b29bc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index 9d89d5f2f3..9d89d5f2f3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index e0426e7b51..e0426e7b51 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json b/metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json
index b3dedd944d..b3dedd944d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/satellite-v9/z0/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
index 04af83427d..04af83427d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
index 2bdb228c52..2bdb228c52 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc9..28402a2cc9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-center/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
index daaadcdba2..daaadcdba2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
index 95aa395c60..95aa395c60 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/point/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-placement/point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
index 6c810abb8a..6c810abb8a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
index 7298ff45e0..7298ff45e0 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index c501cdfe8b..c501cdfe8b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
index b6cfd840ae..b6cfd840ae 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
index 23e6cccadb..23e6cccadb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-z-order/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/bottom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/center/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/center/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/center/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json
index 6d769f5648..6d769f5648 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/top-left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/top-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top/metrics.json b/metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-anchor/top/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-anchor/top/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
index 932066a29f..932066a29f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
index ed9a135831..ed9a135831 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json
index 8ebd514b42..8ebd514b42 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-arabic/line-break/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
index 987740be5e..987740be5e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json
index 60c3ad345f..60c3ad345f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
index 526f4071d8..526f4071d8 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
index 62c000b290..62c000b290 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
index a02d067247..a02d067247 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
index 137e66bf14..137e66bf14 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index a56a73a714..a56a73a714 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
index 197cdb9b50..197cdb9b50 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 4b81074408..4b81074408 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json
index 089da63a88..089da63a88 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 128115bae7..128115bae7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 0f1b65a6db..0f1b65a6db 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
index 1640b2b40b..1640b2b40b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json
index 883429ed73..883429ed73 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/formatted/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/formatted/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json
index f20b89d82f..f20b89d82f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-field/token/metrics.json b/metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json
index fa46462cc5..fa46462cc5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-field/token/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-field/token/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-font/camera-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-font/camera-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-font/data-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json
index aac1bbcfbc..aac1bbcfbc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-font/data-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-font/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-font/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-font/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-blur/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-blur/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-blur/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-color/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-color/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-color/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
index 47cea62594..47cea62594 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-color/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-width/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-width/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-halo-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-justify/auto/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json
index 0f7801b2e4..0f7801b2e4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-justify/auto/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-justify/auto/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-justify/left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-justify/left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-justify/left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-justify/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json
index 5c1e774f37..5c1e774f37 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-justify/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-justify/right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-justify/right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-justify/right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 1a478f9857..1a478f9857 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index 2412b1cc57..2412b1cc57 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
index 97d7f27021..97d7f27021 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index fd1ea83213..fd1ea83213 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-line-height/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-line-height/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
index 9551aabb14..9551aabb14 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-angle/line-center/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json
index 2ad59dd984..2ad59dd984 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-angle/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/force-newline/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
index 4c0301c08d..4c0301c08d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index e6477234cc..e6477234cc 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json
index 05279818ae..05279818ae 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json
index 8eef9a4166..8eef9a4166 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
index b95ec5af3c..b95ec5af3c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
index 563004e912..563004e912 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-offset/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json
index 384ce4dadb..384ce4dadb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-offset/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-opacity/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-opacity/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-opacity/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-opacity/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-opacity/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-opacity/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-opacity/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-opacity/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json
index 6734d0b046..6734d0b046 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-opacity/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index d05556cd14..d05556cd14 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index edd93c6655..edd93c6655 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json b/metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-radial-offset/basic/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json
index 0859331916..0859331916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotate/with-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json
index be4621cd93..be4621cd93 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/composite-expression/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
index 5c85a420f3..5c85a420f3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/composite-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-size/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-size/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-size/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
index 05d7f57555..05d7f57555 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json
index 2bf7d11354..2bf7d11354 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-transform/lowercase/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-transform/property-function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json
index 94f6c3ccd6..94f6c3ccd6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-transform/property-function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json b/metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json
index ecb7316699..ecb7316699 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-transform/uppercase/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-translate/default/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-translate/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-translate/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-translate/function/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-translate/function/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-translate/function/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-translate/literal/metrics.json b/metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-translate/literal/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-translate/literal/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 9953c2ea9e..9953c2ea9e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index dca033517b..dca033517b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc632922..a7cc632922 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
index 806d886e75..806d886e75 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c346277..3a2c346277 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index c4efa5911f..c4efa5911f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131f..415dfc131f 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
index 9dca847cbb..9dca847cbb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
index a8acd89723..a8acd89723 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index 40b67f1445..40b67f1445 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index 74f5df99b3..74f5df99b3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-visibility/none/metrics.json b/metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-visibility/none/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-visibility/none/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-visibility/visible/metrics.json b/metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json
index d7ff42c127..d7ff42c127 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-visibility/visible/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 4da17ca35c..4da17ca35c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
index 4c978ab6c2..4c978ab6c2 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
index 8c2cc0dbcb..8c2cc0dbcb 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
index caf18baec7..caf18baec7 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index 23e8621fe3..23e8621fe3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index eabb4022be..eabb4022be 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 25fb8b4d1e..25fb8b4d1e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index d8ccbe177b..d8ccbe177b 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 632a29ad17..632a29ad17 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 5cf22c6b3e..5cf22c6b3e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index ad6e567fda..ad6e567fda 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index c1486937e1..c1486937e1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json b/metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/tilejson-bounds/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/tms/tms/metrics.json b/metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json
index f7ca11c232..f7ca11c232 100644
--- a/metrics/next-ios-render-test-runner/render-tests/tms/tms/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/tms/tms/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-history/in/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-history/in/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-history/in/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-history/out/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-history/out/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-history/out/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/above/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json
index d11ea20c71..d11ea20c71 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/below/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
index ed48714735..ed48714735 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
index b51667187e..b51667187e 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json
index ca6ff8e333..ca6ff8e333 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoomed-fill/default/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/ios-render-test-runner/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release-metrics.json b/metrics/linux-clang8-release-metrics.json
index 0f6a52d45f..fd1c20d9c8 100644
--- a/metrics/next-linux-gcc8-release-metrics.json
+++ b/metrics/linux-clang8-release-metrics.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
     ],
-    "metric_path": "next-linux-gcc8-release",
+    "metric_path": "linux-clang8-release",
     "probes": [
         "probeGFX",
         "probeMemory",
diff --git a/metrics/next-linux-gcc8-release-style.json b/metrics/linux-clang8-release-style.json
index 8f7093aaaa..93f530b681 100644
--- a/metrics/next-linux-gcc8-release-style.json
+++ b/metrics/linux-clang8-release-style.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
     ],
-    "metric_path": "next-linux-gcc8-release",
+    "metric_path": "linux-clang8-release",
     "probes": [
         "probeGFX",
         "probeNetwork"
diff --git a/metrics/next-linux-clang8-release/probes/gfx/pass-double-probe/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json
index 61ee32242c..61ee32242c 100644
--- a/metrics/next-linux-clang8-release/probes/gfx/pass-double-probe/metrics.json
+++ b/metrics/linux-clang8-release/probes/gfx/pass-double-probe/metrics.json
diff --git a/metrics/next-linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json
index fdccf27159..fdccf27159 100644
--- a/metrics/next-linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json
+++ b/metrics/linux-clang8-release/probes/gfx/pass-probe-reset/metrics.json
diff --git a/metrics/next-linux-clang8-release/probes/gfx/pass/metrics.json b/metrics/linux-clang8-release/probes/gfx/pass/metrics.json
index 7d0d7d26d0..7d0d7d26d0 100644
--- a/metrics/next-linux-clang8-release/probes/gfx/pass/metrics.json
+++ b/metrics/linux-clang8-release/probes/gfx/pass/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-opacity/color/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-opacity/color/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-opacity/color/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-opacity/image/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json
index 7e01e8e930..7e01e8e930 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-opacity/image/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-opacity/image/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-opacity/overlay/metrics.json b/metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json
index 12f80d05a3..12f80d05a3 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-opacity/overlay/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json
index 89a3b9090c..89a3b9090c 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/literal/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json
index cdb304a90f..cdb304a90f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/missing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/pitch/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json
index 77a63a3f58..77a63a3f58 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/pitch/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/rotated/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/rotated/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-pattern/zoomed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/background-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/background-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json
index f5baf3924a..f5baf3924a 100644
--- a/metrics/next-linux-clang8-release/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/basic-v9/z0/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/bright-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json
index bc753ead90..bc753ead90 100644
--- a/metrics/next-linux-clang8-release/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/bright-v9/z0/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/blending/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json
index 3e29447ea9..3e29447ea9 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/blending/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/linestring/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json
index b9307738e0..b9307738e0 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json
index 742ac68192..742ac68192 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/point/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-geometry/polygon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/blending/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/blending/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-width/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-width/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/circle-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/circle-translate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 9dd47aeeeb..9dd47aeeeb 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index f460f1be9e..f460f1be9e 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 94161dda76..94161dda76 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index 6cdf449a0c..6cdf449a0c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 11aca40c02..11aca40c02 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ffa..6ed2f71ffa 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39e..bc4caba39e 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d0..e0337338d0 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-lines/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe383..d9e4fbe383 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca802..d4438ca802 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/debug/collision-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json
index 29bd850670..29bd850670 100644
--- a/metrics/next-linux-clang8-release/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/debug/collision-pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/empty/empty/metrics.json b/metrics/linux-clang8-release/render-tests/empty/empty/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/empty/empty/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/empty/empty/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/extent/1024-fill/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json
index 705eaa2c4e..705eaa2c4e 100644
--- a/metrics/next-linux-clang8-release/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/extent/1024-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/extent/1024-line/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json
index b0ad84b7b6..b0ad84b7b6 100644
--- a/metrics/next-linux-clang8-release/render-tests/extent/1024-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/extent/1024-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/extent/1024-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json
index b5f9604d8e..b5f9604d8e 100644
--- a/metrics/next-linux-clang8-release/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/extent/1024-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/feature-state/composite-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/feature-state/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-linux-clang8-release/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/feature-state/data-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/feature-state/vector-source/metrics.json b/metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-linux-clang8-release/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/feature-state/vector-source/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-antialias/false/metrics.json b/metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-antialias/false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/multiply/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/opacity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json
index 8ae66783ec..8ae66783ec 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
index 424e3e22c8..424e3e22c8 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 5c12ec1c1e..5c12ec1c1e 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index e3548b740c..e3548b740c 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index c272c32be1..c272c32be1 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json
index e7b07b6e25..e7b07b6e25 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
index 808337bb3d..808337bb3d 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index 6b55634a1c..6b55634a1c 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json
index f9de3e6600..f9de3e6600 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
index 0923fe04bb..0923fe04bb 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index 0800242842..0800242842 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json
index c3e66bb650..c3e66bb650 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index 0bf5f29188..0bf5f29188 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json
index 51c11b8e4a..51c11b8e4a 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json
index 5b0f25c103..5b0f25c103 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 714f677bd6..714f677bd6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/missing/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json
index 07184a47f6..07184a47f6 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/missing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
index 0b64b9c6e2..0b64b9c6e2 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index 8107ea6575..8107ea6575 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json
index a3bacd4632..a3bacd4632 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-translate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/fill-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-clang8-release/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/fill-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/filter/equality/metrics.json b/metrics/linux-clang8-release/render-tests/filter/equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/filter/equality/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/filter/equality/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/filter/legacy-equality/metrics.json b/metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/filter/legacy-equality/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/filter/none/metrics.json b/metrics/linux-clang8-release/render-tests/filter/none/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/filter/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/filter/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json
index 921bb22529..921bb22529 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/clustered-properties/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/clustered/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json
index e4de306451..e4de306451 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/clustered/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/clustered/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/external-feature/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/external-feature/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/external-invalid/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json
index c050c4e8ce..c050c4e8ce 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/external-invalid/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/external-linestring/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/external-linestring/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/external-malformed/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json
index c35eb5d526..c35eb5d526 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/external-malformed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
index 92d02167a9..92d02167a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-feature/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json
index 0d433cec13..0d433cec13 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-feature/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-invalid/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json
index 87bafb2c59..87bafb2c59 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json
index b947079d6b..b947079d6b 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-malformed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json
index 676dd680b3..676dd680b3 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json
index fb542cead0..fb542cead0 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-point-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json
index d01fbee184..d01fbee184 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json
index 5b035beb41..5b035beb41 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json
index c031604857..c031604857 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/missing/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/missing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/missing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json
index f1bf8426ca..f1bf8426ca 100644
--- a/metrics/next-linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-color/expression/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-color/expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-intensity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-intensity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json
index 08b7ca1c86..08b7ca1c86 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json
index e12b800462..e12b800462 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/default/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-weight/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
index 3c0b3e0c7f..3c0b3e0c7f 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/heatmap-weight/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0af7981529..0af7981529 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/bottom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/center/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/center/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json
index 06c60d080b..06c60d080b 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/top-left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/top-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top/metrics.json b/metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-anchor/top/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json
index 4c633b4237..4c633b4237 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-blur/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-blur/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json
index 77eaf96958..77eaf96958 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-width/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-width/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index ffd5b98d6b..ffd5b98d6b 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/image-expression/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/image-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/stretchable-content/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/stretchable/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/stretchable/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/stretchable/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-image/token/metrics.json b/metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-image/token/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-image/token/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
index ef86c597d3..ef86c597d3 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-offset/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-offset/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json
index 0760437163..0760437163 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-opacity/text-only/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
index f1cb4ead5f..f1cb4ead5f 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotate/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46a..6d7c07c46a 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json
index 6e8125cf62..6e8125cf62 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json
index 18164e288a..18164e288a 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index 533e640ba8..533e640ba8 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 27c166e4fa..27c166e4fa 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json
index f8a34973b4..f8a34973b4 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/both/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/height/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/none/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json
index f879907a01..f879907a01 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
index 37cfb3b5fd..37cfb3b5fd 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
index 52972bf07e..52972bf07e 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
index 5bec05e584..5bec05e584 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
index 0cd910a99a..0cd910a99a 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
index 3e848e8533..3e848e8533 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
index 6048fc7e0b..6048fc7e0b 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 3c52c61f52..3c52c61f52 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width/metrics.json b/metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-text-fit/width/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-translate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/icon-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/icon-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/default/metrics.json b/metrics/linux-clang8-release/render-tests/image/default/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/image/pitched/metrics.json
index 40cff205c7..40cff205c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-brightness/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-brightness/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-contrast/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-contrast/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-opacity/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-opacity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-resampling/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-resampling/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-saturation/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-saturation/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/image/raster-visibility/metrics.json b/metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-clang8-release/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/image/raster-visibility/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/is-supported-script/filter/metrics.json b/metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-linux-clang8-release/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/is-supported-script/filter/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/is-supported-script/layout/metrics.json b/metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json
index f7dd7ee4c0..f7dd7ee4c0 100644
--- a/metrics/next-linux-clang8-release/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/is-supported-script/layout/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-blur/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-blur/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-blur/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-blur/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-blur/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-blur/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-blur/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-cap/butt/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-cap/butt/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-cap/butt/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-cap/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json
index b8fd663961..b8fd663961 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-cap/round/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-cap/round/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-cap/square/metrics.json b/metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-cap/square/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-cap/square/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json
index 870d30daeb..870d30daeb 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-color/property-function-identity/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json
index b8b502e177..b8b502e177 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json
index f116462d86..f116462d86 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
index a687132530..a687132530 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 45bcb8f0af..45bcb8f0af 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json
index 22bd3284bd..22bd3284bd 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json
index 747a2afbe1..747a2afbe1 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/slant/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json
index 5e55b94da8..5e55b94da8 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/slant/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json
index b4f03708c4..b4f03708c4 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gap-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gap-width/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gap-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gap-width/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gap-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gap-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gap-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gradient/gradient/metrics.json b/metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gradient/gradient/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-gradient/translucent/metrics.json b/metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-gradient/translucent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/bevel/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/bevel/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/bevel/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/default/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/miter-transparent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/miter/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/miter/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/miter/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json
index c43da97741..c43da97741 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json
index 58f534192f..58f534192f 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/round-transparent/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/round-transparent/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-join/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-join/round/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-join/round/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-join/round/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-offset/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-offset/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-offset/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-offset/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-offset/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-offset/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-offset/literal-negative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-offset/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-offset/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-offset/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json
index 49ecdaab98..49ecdaab98 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-opacity/step-curve/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/@2x/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json
index 5163e6758e..5163e6758e 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/pitch/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json
index d108f774d1..d108f774d1 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/pitch/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json
index 136c147615..136c147615 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json
index fbbd2176a9..fbbd2176a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/step-curve/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pitch/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pitch/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pitch/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pitch/pitch0/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pitch/pitch15/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pitch/pitch30/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-sort-key/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json
index 12a7598851..12a7598851 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-sort-key/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-triangulation/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json
index 8e3ab38a23..8e3ab38a23 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-triangulation/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-triangulation/round/metrics.json b/metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json
index 9d54981560..9d54981560 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-triangulation/round/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json
index e66ff128ba..e66ff128ba 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json
index b93dcb8232..b93dcb8232 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/very-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json
index c6cefecd17..c6cefecd17 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/zero-width-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/line-width/zero-width/metrics.json b/metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json
index 2712b0b4fe..2712b0b4fe 100644
--- a/metrics/next-linux-clang8-release/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/line-width/zero-width/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
index bf9483fb78..bf9483fb78 100644
--- a/metrics/next-linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/map-mode/static/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json
index 290ed6328f..290ed6328f 100644
--- a/metrics/next-linux-clang8-release/render-tests/map-mode/static/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/map-mode/static/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad897..199ebad897 100644
--- a/metrics/next-linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/map-mode/tile/metrics.json b/metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json
index 3510a6a2db..3510a6a2db 100644
--- a/metrics/next-linux-clang8-release/render-tests/map-mode/tile/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/map-mode/tile/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/projection/axonometric/metrics.json b/metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-clang8-release/render-tests/projection/axonometric/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/projection/axonometric/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/projection/perspective/metrics.json b/metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-clang8-release/render-tests/projection/perspective/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/projection/perspective/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/projection/skew/metrics.json b/metrics/linux-clang8-release/render-tests/projection/skew/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-clang8-release/render-tests/projection/skew/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/projection/skew/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-alpha/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json
index 08d8297db8..08d8297db8 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-alpha/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-brightness/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-brightness/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-brightness/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-brightness/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-brightness/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-brightness/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-contrast/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-contrast/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-contrast/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-contrast/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-contrast/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-contrast/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-extent/minzoom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-loading/missing/metrics.json b/metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json
index 4bd248b8fa..4bd248b8fa 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-loading/missing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json
index 12c856a698..12c856a698 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping-vector/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json
index c0ad63d409..c0ad63d409 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-masking/overlapping/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-resampling/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-resampling/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-resampling/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-resampling/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-resampling/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-resampling/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-rotation/0/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-rotation/0/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-rotation/180/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-rotation/180/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-rotation/270/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-rotation/270/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-rotation/45/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json
index b4c21ad5c9..b4c21ad5c9 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-rotation/45/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-rotation/90/metrics.json b/metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-rotation/90/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-saturation/default/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-saturation/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-saturation/function/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-saturation/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-saturation/literal/metrics.json b/metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-saturation/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json
index db64850e38..db64850e38 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/raster-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/raster-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/real-world/nepal/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json
index f1142e011c..f1142e011c 100644
--- a/metrics/next-linux-clang8-release/render-tests/real-world/nepal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/real-world/nepal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/real-world/norway/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json
index 45badb494a..45badb494a 100644
--- a/metrics/next-linux-clang8-release/render-tests/real-world/norway/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/real-world/norway/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/real-world/uruguay/metrics.json b/metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json
index 8c183cc9f3..8c183cc9f3 100644
--- a/metrics/next-linux-clang8-release/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/real-world/uruguay/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
index 96bd9fd98f..96bd9fd98f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index a48098b4aa..a48098b4aa 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index c527b4e09d..c527b4e09d 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index 7d15d2a7ad..7d15d2a7ad 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index 2052d5d52e..2052d5d52e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index bcc2a3f74f..bcc2a3f74f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 09d52d402e..09d52d402e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index 65f07ee533..65f07ee533 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index c217fdfc61..c217fdfc61 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 3520563149..3520563149 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index bc237525bb..bc237525bb 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 16485ab8b4..16485ab8b4 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 0500eb4873..0500eb4873 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index a01add499e..a01add499e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index f9443ff76e..f9443ff76e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index 485b59ab36..485b59ab36 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 3468eac0f2..3468eac0f2 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index ba3ca00114..ba3ca00114 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b26951..b3e8b26951 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 54f55f390d..54f55f390d 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index 77e26663ad..77e26663ad 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 2a11129cdd..2a11129cdd 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index e78c748008..e78c748008 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 5e66f07df0..5e66f07df0 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index 20fa03d324..20fa03d324 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 6b144b9538..6b144b9538 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index 63e089963e..63e089963e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 4ab1b5696c..4ab1b5696c 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 7ce4c13248..7ce4c13248 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 2ce8e21873..2ce8e21873 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f8..25b998e4f8 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
index e9fe2a688c..e9fe2a688c 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index 9c7a3359c2..9c7a3359c2 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index 7b8e778406..7b8e778406 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index f8108ef92f..f8108ef92f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 64d5fea021..64d5fea021 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 89aa855d36..89aa855d36 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c8..2e13bfe1c8 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index 693f787042..693f787042 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 2e92924579..2e92924579 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
index a5407ceb76..a5407ceb76 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index a80aa837e4..a80aa837e4 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index 0be45de845..0be45de845 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 89ccfdbed1..89ccfdbed1 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index 98442c7f49..98442c7f49 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index 5cb2eb8428..5cb2eb8428 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index fb4e5552f7..fb4e5552f7 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index ad0cf8a267..ad0cf8a267 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index daa3b24ba1..daa3b24ba1 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index 38eab4e78e..38eab4e78e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index 2bd3523e27..2bd3523e27 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index 16c62d33f5..16c62d33f5 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 4e5b247b07..4e5b247b07 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index 7f54e74803..7f54e74803 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 6de6aa8e28..6de6aa8e28 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 662a5ca35c..662a5ca35c 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
index 4b5fdfaa4a..4b5fdfaa4a 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index eb891b578e..eb891b578e 100644
--- a/metrics/next-linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/retina-raster/default/metrics.json b/metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-linux-clang8-release/render-tests/retina-raster/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/retina-raster/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
index 7b309facc7..7b309facc7 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
index b6e30d5e33..b6e30d5e33 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json
index ac4b3251ff..ac4b3251ff 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json
index 9b2e396f8e..9b2e396f8e 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
index 31a94a030d..31a94a030d 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index c4c12ce6cc..c4c12ce6cc 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index ded111d5db..ded111d5db 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index 7c2bcc88a9..7c2bcc88a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 23b829f168..23b829f168 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 47108b29bc..47108b29bc 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index 9d89d5f2f3..9d89d5f2f3 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
index dea2cb3857..dea2cb3857 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index e0426e7b51..e0426e7b51 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/satellite-v9/z0/metrics.json b/metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json
index b3dedd944d..b3dedd944d 100644
--- a/metrics/next-linux-clang8-release/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/satellite-v9/z0/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json
index 04af83427d..04af83427d 100644
--- a/metrics/next-linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/point/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
index 2bdb228c52..2bdb228c52 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc9..28402a2cc9 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/line-center/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json
index daaadcdba2..daaadcdba2 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json
index 95aa395c60..95aa395c60 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-placement/point/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-placement/point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
index 6c810abb8a..6c810abb8a 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json
index 7298ff45e0..7298ff45e0 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index c501cdfe8b..c501cdfe8b 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json
index b6cfd840ae..b6cfd840ae 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
index 23e6cccadb..23e6cccadb 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json
index 1de5e049d8..1de5e049d8 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/default/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-z-order/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/bottom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/center/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/center/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/center/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json
index 6d769f5648..6d769f5648 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/top-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/top-left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/top-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/top-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-anchor/top/metrics.json b/metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-anchor/top/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-anchor/top/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json
index 932066a29f..932066a29f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json
index ed9a135831..ed9a135831 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-arabic/line-break/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json
index 8ebd514b42..8ebd514b42 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-arabic/line-break/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json
index 987740be5e..987740be5e 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json
index 60c3ad345f..60c3ad345f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json
index 526f4071d8..526f4071d8 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
index 62c000b290..62c000b290 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json
index a02d067247..a02d067247 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json
index 137e66bf14..137e66bf14 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index a56a73a714..a56a73a714 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json
index 197cdb9b50..197cdb9b50 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 4b81074408..4b81074408 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json
index 52b1978f29..52b1978f29 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-images/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-images/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json
index 089da63a88..089da63a88 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 128115bae7..128115bae7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 0f1b65a6db..0f1b65a6db 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json
index 1640b2b40b..1640b2b40b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/formatted/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json
index 883429ed73..883429ed73 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/formatted/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/formatted/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json
index f20b89d82f..f20b89d82f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-field/token/metrics.json b/metrics/linux-clang8-release/render-tests/text-field/token/metrics.json
index fa46462cc5..fa46462cc5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-field/token/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-field/token/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-font/camera-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-font/camera-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-font/chinese/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json
index 46fdec9d05..46fdec9d05 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-font/chinese/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-font/chinese/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-font/data-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json
index aac1bbcfbc..aac1bbcfbc 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-font/data-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-font/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-font/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-font/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-blur/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-blur/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-blur/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-color/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-color/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-color/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-color/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-color/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-color/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json
index 47cea62594..47cea62594 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-color/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-width/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-width/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-width/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-width/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-halo-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-justify/auto/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json
index 0f7801b2e4..0f7801b2e4 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-justify/auto/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-justify/auto/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-justify/left/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-justify/left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-justify/left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-justify/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json
index 5c1e774f37..5c1e774f37 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-justify/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-justify/right/metrics.json b/metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-justify/right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-justify/right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 1a478f9857..1a478f9857 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index 2412b1cc57..2412b1cc57 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json
index 97d7f27021..97d7f27021 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index fd1ea83213..fd1ea83213 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-line-height/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-line-height/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json
index 9551aabb14..9551aabb14 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-angle/line-center/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-angle/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json
index 2ad59dd984..2ad59dd984 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-angle/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/force-newline/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
index 4c0301c08d..4c0301c08d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index e6477234cc..e6477234cc 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json
index 05279818ae..05279818ae 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json
index 8eef9a4166..8eef9a4166 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
index b95ec5af3c..b95ec5af3c 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json
index 563004e912..563004e912 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-offset/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json
index 384ce4dadb..384ce4dadb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-offset/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-opacity/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-opacity/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-opacity/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-opacity/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-opacity/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-opacity/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-opacity/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-opacity/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-opacity/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json
index 6734d0b046..6734d0b046 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index d05556cd14..d05556cd14 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index edd93c6655..edd93c6655 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-radial-offset/basic/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json
index 0859331916..0859331916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotate/with-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/composite-expression/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json
index be4621cd93..be4621cd93 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/composite-expression/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json
index 5c85a420f3..5c85a420f3 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/composite-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/composite-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/function/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-size/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-size/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-size/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json
index 05d7f57555..05d7f57555 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-transform/lowercase/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json
index 2bf7d11354..2bf7d11354 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-transform/lowercase/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-transform/property-function/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json
index 94f6c3ccd6..94f6c3ccd6 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-transform/property-function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-transform/uppercase/metrics.json b/metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json
index ecb7316699..ecb7316699 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-transform/uppercase/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-translate/default/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-translate/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-translate/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-translate/function/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-translate/function/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-translate/function/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-translate/literal/metrics.json b/metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-translate/literal/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-translate/literal/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 9953c2ea9e..9953c2ea9e 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index dca033517b..dca033517b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc632922..a7cc632922 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
index 806d886e75..806d886e75 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c346277..3a2c346277 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index c4efa5911f..c4efa5911f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131f..415dfc131f 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json
index 9dca847cbb..9dca847cbb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json
index a8acd89723..a8acd89723 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index 40b67f1445..40b67f1445 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index 74f5df99b3..74f5df99b3 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-visibility/none/metrics.json b/metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-visibility/none/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-visibility/none/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-visibility/visible/metrics.json b/metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json
index d7ff42c127..d7ff42c127 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-visibility/visible/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 4da17ca35c..4da17ca35c 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
index 4c978ab6c2..4c978ab6c2 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
index 8c2cc0dbcb..8c2cc0dbcb 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
index caf18baec7..caf18baec7 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index 23e8621fe3..23e8621fe3 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index eabb4022be..eabb4022be 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 25fb8b4d1e..25fb8b4d1e 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index d8ccbe177b..d8ccbe177b 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 632a29ad17..632a29ad17 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 5cf22c6b3e..5cf22c6b3e 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index ad6e567fda..ad6e567fda 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index c1486937e1..c1486937e1 100644
--- a/metrics/next-linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/tilejson-bounds/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/tms/tms/metrics.json b/metrics/linux-clang8-release/render-tests/tms/tms/metrics.json
index f7ca11c232..f7ca11c232 100644
--- a/metrics/next-linux-clang8-release/render-tests/tms/tms/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/tms/tms/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-history/in/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-history/in/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-history/in/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-history/out/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-history/out/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-history/out/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/above/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/above/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/below/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json
index d11ea20c71..d11ea20c71 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/below/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json
index ed48714735..ed48714735 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json
index b51667187e..b51667187e 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoomed-fill/default/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json
index ca6ff8e333..ca6ff8e333 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoomed-fill/default/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/linux-clang8-release/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/metrics/next-linux-gcc8-debug-coverage-style.json b/metrics/linux-gcc8-debug-coverage-style.json
index 7c99b2784c..7c99b2784c 100644
--- a/metrics/next-linux-gcc8-debug-coverage-style.json
+++ b/metrics/linux-gcc8-debug-coverage-style.json
diff --git a/metrics/next-linux-clang8-release-metrics.json b/metrics/linux-gcc8-release-metrics.json
index 69793b589c..b39d519490 100644
--- a/metrics/next-linux-clang8-release-metrics.json
+++ b/metrics/linux-gcc8-release-metrics.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
     ],
-    "metric_path": "next-linux-clang8-release",
+    "metric_path": "linux-gcc8-release",
     "probes": [
         "probeGFX",
         "probeMemory",
diff --git a/metrics/next-linux-clang8-release-style.json b/metrics/linux-gcc8-release-style.json
index a839a9e15d..1ee499069f 100644
--- a/metrics/next-linux-clang8-release-style.json
+++ b/metrics/linux-gcc8-release-style.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
     ],
-    "metric_path": "next-linux-clang8-release",
+    "metric_path": "linux-gcc8-release",
     "probes": [
         "probeGFX",
         "probeNetwork"
diff --git a/metrics/next-linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json
index a1cf51f64c..a1cf51f64c 100644
--- a/metrics/next-linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json
+++ b/metrics/linux-gcc8-release/probes/gfx/pass-double-probe/metrics.json
diff --git a/metrics/next-linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json
index 0f72f9e5c2..0f72f9e5c2 100644
--- a/metrics/next-linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json
+++ b/metrics/linux-gcc8-release/probes/gfx/pass-probe-reset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/probes/gfx/pass/metrics.json b/metrics/linux-gcc8-release/probes/gfx/pass/metrics.json
index f003dce9a0..f003dce9a0 100644
--- a/metrics/next-linux-gcc8-release/probes/gfx/pass/metrics.json
+++ b/metrics/linux-gcc8-release/probes/gfx/pass/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-opacity/color/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-opacity/color/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-opacity/color/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-opacity/image/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json
index 7e01e8e930..7e01e8e930 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-opacity/image/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-opacity/image/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json b/metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json
index 12f80d05a3..12f80d05a3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-opacity/overlay/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json
index 89a3b9090c..89a3b9090c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json
index cdb304a90f..cdb304a90f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/missing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json
index 77a63a3f58..77a63a3f58 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/pitch/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/rotated/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-pattern/zoomed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/background-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/background-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json
index f5baf3924a..f5baf3924a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/basic-v9/z0/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/bright-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json
index bc753ead90..bc753ead90 100644
--- a/metrics/next-linux-gcc8-release/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/bright-v9/z0/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/blending/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json
index 3e29447ea9..3e29447ea9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/blending/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/linestring/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json
index b9307738e0..b9307738e0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json
index 742ac68192..742ac68192 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/point/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-geometry/polygon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/blending/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/circle-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/circle-translate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 9dd47aeeeb..9dd47aeeeb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index f460f1be9e..f460f1be9e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 94161dda76..94161dda76 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index 6cdf449a0c..6cdf449a0c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 11aca40c02..11aca40c02 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ffa..6ed2f71ffa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39e..bc4caba39e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d0..e0337338d0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-lines/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe383..d9e4fbe383 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca802..d4438ca802 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json
index 29bd850670..29bd850670 100644
--- a/metrics/next-linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/debug/collision-pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/empty/empty/metrics.json b/metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/empty/empty/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/empty/empty/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/extent/1024-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json
index 705eaa2c4e..705eaa2c4e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/extent/1024-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/extent/1024-line/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json
index b0ad84b7b6..b0ad84b7b6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/extent/1024-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/extent/1024-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json
index b5f9604d8e..b5f9604d8e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/extent/1024-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/feature-state/composite-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/feature-state/data-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json b/metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/feature-state/vector-source/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-antialias/false/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-antialias/false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/multiply/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/opacity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json
index 8ae66783ec..8ae66783ec 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
index 424e3e22c8..424e3e22c8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 5c12ec1c1e..5c12ec1c1e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index e3548b740c..e3548b740c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index c272c32be1..c272c32be1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json
index e7b07b6e25..e7b07b6e25 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
index 808337bb3d..808337bb3d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index 6b55634a1c..6b55634a1c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json
index f9de3e6600..f9de3e6600 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
index 0923fe04bb..0923fe04bb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index 0800242842..0800242842 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json
index c3e66bb650..c3e66bb650 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index 0bf5f29188..0bf5f29188 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json
index 51c11b8e4a..51c11b8e4a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json
index 5b0f25c103..5b0f25c103 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 714f677bd6..714f677bd6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json
index 07184a47f6..07184a47f6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/missing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
index 0b64b9c6e2..0b64b9c6e2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index 8107ea6575..8107ea6575 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json
index a3bacd4632..a3bacd4632 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-translate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/fill-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/filter/equality/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/filter/equality/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/filter/equality/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/filter/legacy-equality/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/filter/none/metrics.json b/metrics/linux-gcc8-release/render-tests/filter/none/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/filter/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/filter/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json
index 921bb22529..921bb22529 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/clustered-properties/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/clustered/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json
index e4de306451..e4de306451 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/clustered/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/clustered/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/external-feature/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/external-feature/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json
index c050c4e8ce..c050c4e8ce 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/external-invalid/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/external-linestring/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json
index c35eb5d526..c35eb5d526 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/external-malformed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
index 92d02167a9..92d02167a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json
index 0d433cec13..0d433cec13 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-feature/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-invalid/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json
index 87bafb2c59..87bafb2c59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json
index b947079d6b..b947079d6b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-malformed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json
index 676dd680b3..676dd680b3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json
index fb542cead0..fb542cead0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json
index d01fbee184..d01fbee184 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json
index 5b035beb41..5b035beb41 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json
index c031604857..c031604857 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/missing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/missing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json
index f1bf8426ca..f1bf8426ca 100644
--- a/metrics/next-linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-color/expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json
index 08b7ca1c86..08b7ca1c86 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json
index e12b800462..e12b800462 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-weight/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
index 3c0b3e0c7f..3c0b3e0c7f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/heatmap-weight/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0af7981529..0af7981529 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/bottom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/center/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/center/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json
index 06c60d080b..06c60d080b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/top-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-anchor/top/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json
index 4c633b4237..4c633b4237 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json
index 77eaf96958..77eaf96958 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-width/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-width/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index ffd5b98d6b..ffd5b98d6b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/image-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable-content/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/stretchable/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-image/token/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-image/token/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-image/token/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
index ef86c597d3..ef86c597d3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-offset/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-offset/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json
index 0760437163..0760437163 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-opacity/text-only/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
index f1cb4ead5f..f1cb4ead5f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotate/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46a..6d7c07c46a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json
index 6e8125cf62..6e8125cf62 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json
index 18164e288a..18164e288a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index 533e640ba8..533e640ba8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 27c166e4fa..27c166e4fa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json
index f8a34973b4..f8a34973b4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/both/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-both/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/height/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json
index f879907a01..f879907a01 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
index 37cfb3b5fd..37cfb3b5fd 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
index 52972bf07e..52972bf07e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
index 5bec05e584..5bec05e584 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
index 0cd910a99a..0cd910a99a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
index 3e848e8533..3e848e8533 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
index 6048fc7e0b..6048fc7e0b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 3c52c61f52..3c52c61f52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-text-fit/width/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-translate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/icon-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/default/metrics.json b/metrics/linux-gcc8-release/render-tests/image/default/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json
index 40cff205c7..40cff205c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-brightness/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-brightness/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-contrast/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-contrast/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-opacity/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-opacity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-resampling/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-resampling/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-saturation/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-saturation/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/image/raster-visibility/metrics.json b/metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/image/raster-visibility/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json b/metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/is-supported-script/filter/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json b/metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json
index f7dd7ee4c0..f7dd7ee4c0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/is-supported-script/layout/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-blur/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-blur/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-blur/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-blur/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-blur/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-blur/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-blur/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-cap/butt/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-cap/butt/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-cap/butt/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-cap/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json
index b8fd663961..b8fd663961 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-cap/round/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-cap/round/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-cap/square/metrics.json b/metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-cap/square/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-cap/square/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json
index 870d30daeb..870d30daeb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-color/property-function-identity/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json
index b8b502e177..b8b502e177 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json
index f116462d86..f116462d86 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
index a687132530..a687132530 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 45bcb8f0af..45bcb8f0af 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json
index 22bd3284bd..22bd3284bd 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json
index 747a2afbe1..747a2afbe1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json
index 5e55b94da8..5e55b94da8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/slant/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json
index b4f03708c4..b4f03708c4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gap-width/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gap-width/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gap-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gap-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gradient/gradient/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-gradient/translucent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/bevel/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/bevel/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/bevel/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/miter-transparent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/miter/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/miter/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/miter/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json
index c43da97741..c43da97741 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json
index 58f534192f..58f534192f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/round-transparent/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-join/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-join/round/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-join/round/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-offset/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-offset/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-offset/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-offset/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-offset/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-offset/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-offset/literal-negative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-offset/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-offset/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-offset/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json
index 49ecdaab98..49ecdaab98 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-opacity/step-curve/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json
index 5163e6758e..5163e6758e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/@2x/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json
index d108f774d1..d108f774d1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/pitch/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json
index 136c147615..136c147615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json
index fbbd2176a9..fbbd2176a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/step-curve/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pitch/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pitch/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pitch/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch0/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch15/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pitch/pitch30/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json
index 12a7598851..12a7598851 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-triangulation/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json
index 8e3ab38a23..8e3ab38a23 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-triangulation/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-triangulation/round/metrics.json b/metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json
index 9d54981560..9d54981560 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-triangulation/round/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json
index e66ff128ba..e66ff128ba 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json
index b93dcb8232..b93dcb8232 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/very-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json
index c6cefecd17..c6cefecd17 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/zero-width-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/line-width/zero-width/metrics.json b/metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json
index 2712b0b4fe..2712b0b4fe 100644
--- a/metrics/next-linux-gcc8-release/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/line-width/zero-width/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
index bf9483fb78..bf9483fb78 100644
--- a/metrics/next-linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/map-mode/static/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json
index 290ed6328f..290ed6328f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/map-mode/static/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/map-mode/static/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad897..199ebad897 100644
--- a/metrics/next-linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/map-mode/tile/metrics.json b/metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json
index 3510a6a2db..3510a6a2db 100644
--- a/metrics/next-linux-gcc8-release/render-tests/map-mode/tile/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/map-mode/tile/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/projection/axonometric/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-gcc8-release/render-tests/projection/axonometric/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/projection/axonometric/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/projection/perspective/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-gcc8-release/render-tests/projection/perspective/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/projection/perspective/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/projection/skew/metrics.json b/metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-linux-gcc8-release/render-tests/projection/skew/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/projection/skew/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-alpha/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json
index 08d8297db8..08d8297db8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-alpha/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-brightness/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-brightness/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-brightness/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-contrast/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-contrast/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-contrast/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-extent/minzoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-loading/missing/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json
index 4bd248b8fa..4bd248b8fa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-loading/missing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json
index 12c856a698..12c856a698 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping-vector/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json
index c0ad63d409..c0ad63d409 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-masking/overlapping/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-resampling/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-resampling/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-resampling/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/0/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-rotation/0/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/180/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-rotation/180/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/270/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-rotation/270/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/45/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json
index b4c21ad5c9..b4c21ad5c9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-rotation/45/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/90/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-rotation/90/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/default/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-saturation/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/function/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-saturation/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-saturation/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json
index db64850e38..db64850e38 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/raster-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/real-world/nepal/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json
index f1142e011c..f1142e011c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/real-world/nepal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/real-world/nepal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/real-world/norway/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json
index 45badb494a..45badb494a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/real-world/norway/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/real-world/norway/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/real-world/uruguay/metrics.json b/metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json
index 8c183cc9f3..8c183cc9f3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/real-world/uruguay/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
index 96bd9fd98f..96bd9fd98f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index a48098b4aa..a48098b4aa 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index c527b4e09d..c527b4e09d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index 7d15d2a7ad..7d15d2a7ad 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index 2052d5d52e..2052d5d52e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index bcc2a3f74f..bcc2a3f74f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 09d52d402e..09d52d402e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index 65f07ee533..65f07ee533 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index c217fdfc61..c217fdfc61 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 3520563149..3520563149 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index bc237525bb..bc237525bb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 16485ab8b4..16485ab8b4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 0500eb4873..0500eb4873 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index a01add499e..a01add499e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index f9443ff76e..f9443ff76e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index 485b59ab36..485b59ab36 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 3468eac0f2..3468eac0f2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index ba3ca00114..ba3ca00114 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b26951..b3e8b26951 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 54f55f390d..54f55f390d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index 77e26663ad..77e26663ad 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 2a11129cdd..2a11129cdd 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index e78c748008..e78c748008 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 5e66f07df0..5e66f07df0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index 20fa03d324..20fa03d324 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 6b144b9538..6b144b9538 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index 63e089963e..63e089963e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 4ab1b5696c..4ab1b5696c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 7ce4c13248..7ce4c13248 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 2ce8e21873..2ce8e21873 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f8..25b998e4f8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
index e9fe2a688c..e9fe2a688c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index 9c7a3359c2..9c7a3359c2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index 7b8e778406..7b8e778406 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index f8108ef92f..f8108ef92f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 64d5fea021..64d5fea021 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 89aa855d36..89aa855d36 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c8..2e13bfe1c8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index 693f787042..693f787042 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 2e92924579..2e92924579 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
index a5407ceb76..a5407ceb76 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index a80aa837e4..a80aa837e4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index 0be45de845..0be45de845 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 89ccfdbed1..89ccfdbed1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index 98442c7f49..98442c7f49 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index 5cb2eb8428..5cb2eb8428 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index fb4e5552f7..fb4e5552f7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index ad0cf8a267..ad0cf8a267 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index daa3b24ba1..daa3b24ba1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index 38eab4e78e..38eab4e78e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index 2bd3523e27..2bd3523e27 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index 16c62d33f5..16c62d33f5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 4e5b247b07..4e5b247b07 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index 7f54e74803..7f54e74803 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 6de6aa8e28..6de6aa8e28 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 662a5ca35c..662a5ca35c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
index 4b5fdfaa4a..4b5fdfaa4a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index eb891b578e..eb891b578e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/retina-raster/default/metrics.json b/metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/retina-raster/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/retina-raster/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
index 7b309facc7..7b309facc7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
index b6e30d5e33..b6e30d5e33 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json
index ac4b3251ff..ac4b3251ff 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json
index 9b2e396f8e..9b2e396f8e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
index 31a94a030d..31a94a030d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/image-update-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index c4c12ce6cc..c4c12ce6cc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index ded111d5db..ded111d5db 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index 7c2bcc88a9..7c2bcc88a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 23b829f168..23b829f168 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 47108b29bc..47108b29bc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index 9d89d5f2f3..9d89d5f2f3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
index dea2cb3857..dea2cb3857 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index e0426e7b51..e0426e7b51 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json b/metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json
index b3dedd944d..b3dedd944d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/satellite-v9/z0/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json
index 04af83427d..04af83427d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
index 2bdb228c52..2bdb228c52 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc9..28402a2cc9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-center/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json
index daaadcdba2..daaadcdba2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json
index 95aa395c60..95aa395c60 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/point/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-placement/point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
index 6c810abb8a..6c810abb8a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json
index 7298ff45e0..7298ff45e0 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index c501cdfe8b..c501cdfe8b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json
index b6cfd840ae..b6cfd840ae 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
index 23e6cccadb..23e6cccadb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json
index 1de5e049d8..1de5e049d8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-z-order/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/bottom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/center/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/center/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/center/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json
index 6d769f5648..6d769f5648 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/top-left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/top-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top/metrics.json b/metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-anchor/top/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-anchor/top/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json
index 932066a29f..932066a29f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json
index ed9a135831..ed9a135831 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json
index 8ebd514b42..8ebd514b42 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-arabic/line-break/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json
index 987740be5e..987740be5e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json
index 60c3ad345f..60c3ad345f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json
index 526f4071d8..526f4071d8 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
index 62c000b290..62c000b290 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json
index a02d067247..a02d067247 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json
index 137e66bf14..137e66bf14 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index a56a73a714..a56a73a714 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json
index 197cdb9b50..197cdb9b50 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 4b81074408..4b81074408 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json
index 52b1978f29..52b1978f29 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-images/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json
index 089da63a88..089da63a88 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 128115bae7..128115bae7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 0f1b65a6db..0f1b65a6db 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json
index 1640b2b40b..1640b2b40b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json
index 883429ed73..883429ed73 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/formatted/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/formatted/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json
index f20b89d82f..f20b89d82f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-field/token/metrics.json b/metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json
index fa46462cc5..fa46462cc5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-field/token/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-field/token/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-font/camera-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-font/camera-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-font/chinese/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json
index 46fdec9d05..46fdec9d05 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-font/chinese/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-font/chinese/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-font/data-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json
index aac1bbcfbc..aac1bbcfbc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-font/data-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-font/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-font/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-font/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-blur/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-blur/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-blur/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-color/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-color/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-color/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json
index 47cea62594..47cea62594 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-color/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-width/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-width/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-halo-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-justify/auto/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json
index 0f7801b2e4..0f7801b2e4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-justify/auto/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-justify/auto/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-justify/left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-justify/left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-justify/left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-justify/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json
index 5c1e774f37..5c1e774f37 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-justify/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-justify/right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-justify/right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-justify/right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 1a478f9857..1a478f9857 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index 2412b1cc57..2412b1cc57 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json
index 97d7f27021..97d7f27021 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index fd1ea83213..fd1ea83213 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-line-height/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-line-height/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json
index 9551aabb14..9551aabb14 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-angle/line-center/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json
index 2ad59dd984..2ad59dd984 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-angle/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/force-newline/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
index 4c0301c08d..4c0301c08d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index e6477234cc..e6477234cc 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json
index 05279818ae..05279818ae 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json
index 8eef9a4166..8eef9a4166 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
index b95ec5af3c..b95ec5af3c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json
index 563004e912..563004e912 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-offset/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json
index 384ce4dadb..384ce4dadb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-offset/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-opacity/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-opacity/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-opacity/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-opacity/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-opacity/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-opacity/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-opacity/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-opacity/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json
index 6734d0b046..6734d0b046 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-opacity/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index d05556cd14..d05556cd14 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index edd93c6655..edd93c6655 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-radial-offset/basic/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json
index 0859331916..0859331916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotate/with-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json
index be4621cd93..be4621cd93 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/composite-expression/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json
index 5c85a420f3..5c85a420f3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/composite-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-size/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-size/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-size/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json
index 05d7f57555..05d7f57555 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json
index 2bf7d11354..2bf7d11354 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-transform/lowercase/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-transform/property-function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json
index 94f6c3ccd6..94f6c3ccd6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-transform/property-function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json b/metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json
index ecb7316699..ecb7316699 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-transform/uppercase/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-translate/default/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-translate/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-translate/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-translate/function/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-translate/function/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-translate/function/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-translate/literal/metrics.json b/metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-translate/literal/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-translate/literal/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 9953c2ea9e..9953c2ea9e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index dca033517b..dca033517b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc632922..a7cc632922 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
index 806d886e75..806d886e75 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c346277..3a2c346277 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index c4efa5911f..c4efa5911f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131f..415dfc131f 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json
index 9dca847cbb..9dca847cbb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json
index a8acd89723..a8acd89723 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index 40b67f1445..40b67f1445 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index 74f5df99b3..74f5df99b3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-visibility/none/metrics.json b/metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-visibility/none/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-visibility/none/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-visibility/visible/metrics.json b/metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json
index d7ff42c127..d7ff42c127 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-visibility/visible/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 4da17ca35c..4da17ca35c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
index 4c978ab6c2..4c978ab6c2 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
index 8c2cc0dbcb..8c2cc0dbcb 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
index caf18baec7..caf18baec7 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index 23e8621fe3..23e8621fe3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index eabb4022be..eabb4022be 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 25fb8b4d1e..25fb8b4d1e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index d8ccbe177b..d8ccbe177b 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 632a29ad17..632a29ad17 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 5cf22c6b3e..5cf22c6b3e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index ad6e567fda..ad6e567fda 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index c1486937e1..c1486937e1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/tms/tms/metrics.json b/metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json
index f7ca11c232..f7ca11c232 100644
--- a/metrics/next-linux-gcc8-release/render-tests/tms/tms/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/tms/tms/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-history/in/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-history/in/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-history/in/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-history/out/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-history/out/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-history/out/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/above/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json
index d11ea20c71..d11ea20c71 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/below/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json
index ed48714735..ed48714735 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json
index b51667187e..b51667187e 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json
index ca6ff8e333..ca6ff8e333 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoomed-fill/default/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/linux-gcc8-release/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/metrics/next-linux-tsan-style.json b/metrics/linux-tsan-style.json
index 7c99b2784c..7c99b2784c 100644
--- a/metrics/next-linux-tsan-style.json
+++ b/metrics/linux-tsan-style.json
diff --git a/metrics/next-macos-xcode11-debug-style.json b/metrics/macos-xcode11-debug-style.json
index 083f78450e..083f78450e 100644
--- a/metrics/next-macos-xcode11-debug-style.json
+++ b/metrics/macos-xcode11-debug-style.json
diff --git a/metrics/next-macos-xcode11-release-metrics.json b/metrics/macos-xcode11-release-metrics.json
index 41e517bdc8..de61c07461 100644
--- a/metrics/next-macos-xcode11-release-metrics.json
+++ b/metrics/macos-xcode11-release-metrics.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-macos.json"
     ],
-    "metric_path": "next-macos-xcode11-release",
+    "metric_path": "macos-xcode11-release",
     "probes": [
         "probeGFX",
         "probeMemory",
diff --git a/metrics/next-macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json
index 326fc645f2..9d709dc95a 100644
--- a/metrics/next-macos-xcode11-release-style.json
+++ b/metrics/macos-xcode11-release-style.json
@@ -8,7 +8,7 @@
         "ignores/platform-all.json",
         "ignores/platform-macos.json"
     ],
-    "metric_path": "next-macos-xcode11-release",
+    "metric_path": "macos-xcode11-release",
     "probes": [
         "probeGFX",
         "probeNetwork"
diff --git a/metrics/next-macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json
index 024e1f6ece..024e1f6ece 100644
--- a/metrics/next-macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json
+++ b/metrics/macos-xcode11-release/probes/gfx/pass-double-probe/metrics.json
diff --git a/metrics/next-macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json
index 9b3f664d4b..9b3f664d4b 100644
--- a/metrics/next-macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json
+++ b/metrics/macos-xcode11-release/probes/gfx/pass-probe-reset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/probes/gfx/pass/metrics.json b/metrics/macos-xcode11-release/probes/gfx/pass/metrics.json
index c87c8e061c..c87c8e061c 100644
--- a/metrics/next-macos-xcode11-release/probes/gfx/pass/metrics.json
+++ b/metrics/macos-xcode11-release/probes/gfx/pass/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-color/colorSpace-lab/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-opacity/color/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-opacity/color/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-opacity/color/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-opacity/image/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json
index 7e01e8e930..7e01e8e930 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-opacity/image/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-opacity/image/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json b/metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json
index 12f80d05a3..12f80d05a3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-opacity/overlay/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json
index 89a3b9090c..89a3b9090c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/@2x/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json
index cdb304a90f..cdb304a90f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/missing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/missing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json
index 77a63a3f58..77a63a3f58 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/pitch/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/rotated/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json
index b17c1d43cf..b17c1d43cf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-pattern/zoomed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/background-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/background-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/background-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-narrow-y/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json
index d149583eac..d149583eac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/basic-v9/z0-wide-x/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json
index f5baf3924a..f5baf3924a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/basic-v9/z0/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/basic-v9/z0/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/bright-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json
index bc753ead90..bc753ead90 100644
--- a/metrics/next-macos-xcode11-release/render-tests/bright-v9/z0/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/bright-v9/z0/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/blending/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json
index 3e29447ea9..3e29447ea9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/blending/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/blending/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/literal-stroke/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-blur/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/linestring/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json
index b9307738e0..b9307738e0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/multilinestring/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipoint/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json
index 742ac68192..742ac68192 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/multipolygon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/point/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-geometry/polygon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/blending/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/map-scale-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-alignment/viewport-scale-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json
index 62ea5c7dea..62ea5c7dea 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-pitch-scale/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/antimeridian/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-radius/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
index cd37b906a5..cd37b906a5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/stroke-only/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-stroke-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/circle-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/circle-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/circle-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
index b65ae23a75..b65ae23a75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
index 5cc4b977ff..5cc4b977ff 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
index fe9af55d56..fe9af55d56 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
index 43b92c8fd6..43b92c8fd6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
index aeff97a9b2..aeff97a9b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/background-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
index d5ad1d9303..d5ad1d9303 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/circle-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
index d0a09330c3..d0a09330c3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
index 070982798d..070982798d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
index 9dd47aeeeb..9dd47aeeeb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
index f460f1be9e..f460f1be9e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-extrusion-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-opaque--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
index d9701f6181..d9701f6181 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
index 54232a8859..54232a8859 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
index 158f4a877c..158f4a877c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
index 511b43f4d2..511b43f4d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/fill-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
index 046dcc83f8..046dcc83f8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
index b342e18183..b342e18183 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
index a4c2b929c7..a4c2b929c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
index 5565a4dd48..5565a4dd48 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
index 94161dda76..94161dda76 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/heatmap-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
index 019fd54df3..019fd54df3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
index 2ecd93ab0d..2ecd93ab0d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
index f9f2c55c05..f9f2c55c05 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
index 130eb52850..130eb52850 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
index eb8235bd22..eb8235bd22 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
index 6cdf449a0c..6cdf449a0c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/hillshade-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
index 34e1641244..34e1641244 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
index b9a70d7457..b9a70d7457 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
index aac3c6d308..aac3c6d308 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
index e6b45ea3c9..e6b45ea3c9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
index 1d0c8f8153..1d0c8f8153 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
index 2fb82f1086..2fb82f1086 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/line-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
index 9297ddb669..9297ddb669 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
index 8543c93e3f..8543c93e3f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
index ba3da4f660..ba3da4f660 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
index a6e96270b2..a6e96270b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
index 46ae22eb39..46ae22eb39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
index 40f09a9305..40f09a9305 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
index dfb24aaa91..dfb24aaa91 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
index 11aca40c02..11aca40c02 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/raster-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--background-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
index 7f04882574..7f04882574 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--circle-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
index e06f8fc8fc..e06f8fc8fc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-extrusion-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-opaque/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
index c1bede4b52..c1bede4b52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--fill-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
index 60f01ff9e3..60f01ff9e3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--heatmap-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
index 1b23d9d85c..1b23d9d85c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--hillshade-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
index cafdf6fa10..cafdf6fa10 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--line-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
index 1900b99249..1900b99249 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--raster-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/combinations/symbol-translucent--symbol-translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
index 6ed2f71ffa..6ed2f71ffa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-line-translate/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
index bc4caba39e..bc4caba39e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-icon-text-point-translate/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
index e0337338d0..e0337338d0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines-pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
index 9f0230b683..9f0230b683 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-lines/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
index d9e4fbe383..d9e4fbe383 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
index d4438ca802..d4438ca802 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched-wrapped/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
index 29bd850670..29bd850670 100644
--- a/metrics/next-macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/debug/collision-pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/empty/empty/metrics.json b/metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/empty/empty/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/empty/empty/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/extent/1024-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json
index 705eaa2c4e..705eaa2c4e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/extent/1024-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/extent/1024-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/extent/1024-line/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json
index b0ad84b7b6..b0ad84b7b6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/extent/1024-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/extent/1024-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json
index b5f9604d8e..b5f9604d8e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/extent/1024-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/feature-state/composite-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/feature-state/data-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json b/metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/feature-state/vector-source/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-antialias/false/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-antialias/false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-antialias/false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/multiply/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/multiply/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json
index 8ae66783ec..8ae66783ec 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json
index 424e3e22c8..424e3e22c8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/negative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json
index ccd42b0dde..ccd42b0dde 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
index 5c12ec1c1e..5c12ec1c1e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-base/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/no-alpha-no-multiply/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
index e3548b740c..e3548b740c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json
index 47ec0bb2c6..47ec0bb2c6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/negative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json
index 4f179c4d25..4f179c4d25 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
index ffe069ce46..ffe069ce46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-height/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
index c272c32be1..c272c32be1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/interleaved-layers/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-multiple/multiple/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json
index e7b07b6e25..e7b07b6e25 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json
index d0cf84edc1..d0cf84edc1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json
index 808337bb3d..808337bb3d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-pattern/missing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
index 0fa0470318..0fa0470318 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
index 082bdc32eb..082bdc32eb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal-opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json
index 2c2af11696..2c2af11696 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
index 1b222aa314..1b222aa314 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-extrusion-vertical-gradient/false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
index 6b55634a1c..6b55634a1c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/opaque-fill-over-symbol-layer/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json
index f9de3e6600..f9de3e6600 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/overlapping/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json
index 0923fe04bb..0923fe04bb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
index cc32c1d107..cc32c1d107 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
index 0800242842..0800242842 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-opacity/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/multiply/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json
index c3e66bb650..c3e66bb650 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
index 0bf5f29188..0bf5f29188 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-outline-color/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json
index 51c11b8e4a..51c11b8e4a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/@2x/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json
index 5b0f25c103..5b0f25c103 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/case-data-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
index 714f677bd6..714f677bd6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/invalid-feature-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json
index 07184a47f6..07184a47f6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/missing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json
index 0b64b9c6e2..0b64b9c6e2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/uneven-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
index 8107ea6575..8107ea6575 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/wrapping-with-interpolation/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-pattern/zoomed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json
index a3bacd4632..a3bacd4632 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json
index ec5a832777..ec5a832777 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/fill-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/filter/equality/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/filter/equality/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/filter/equality/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/filter/legacy-equality/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/filter/none/metrics.json b/metrics/macos-xcode11-release/render-tests/filter/none/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/filter/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/filter/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json
index 921bb22529..921bb22529 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/clustered-properties/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/clustered/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json
index e4de306451..e4de306451 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/clustered/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/clustered/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/external-feature/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/external-feature/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/external-feature/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json
index c050c4e8ce..c050c4e8ce 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/external-invalid/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json
index 1f4a35b379..1f4a35b379 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/external-linestring/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json
index c35eb5d526..c35eb5d526 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/external-malformed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json
index 92d02167a9..92d02167a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inconsistent-winding-order/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json
index 0d433cec13..0d433cec13 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-feature/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-invalid/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json
index 87bafb2c59..87bafb2c59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json
index b947079d6b..b947079d6b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-linestring-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-malformed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json
index 676dd680b3..676dd680b3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json
index fb542cead0..fb542cead0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-point-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json
index d01fbee184..d01fbee184 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json
index 5b035beb41..5b035beb41 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json
index c031604857..c031604857 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/inline-polygon-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/missing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/missing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json
index f1bf8426ca..f1bf8426ca 100644
--- a/metrics/next-macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/geojson/reparse-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json
index e300a2d0a6..e300a2d0a6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-color/expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-intensity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json
index 4daf3ff957..4daf3ff957 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json
index 08b7ca1c86..08b7ca1c86 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/antimeridian/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json
index e12b800462..e12b800462 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/data-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-radius/pitch30/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-weight/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json
index 3c0b3e0c7f..3c0b3e0c7f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-weight/identity-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json
index 098f2da894..098f2da894 100644
--- a/metrics/next-macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/heatmap-weight/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json
index 0af7981529..0af7981529 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/terrarium/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-accent-color/zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-highlight-color/zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
index da22284860..da22284860 100644
--- a/metrics/next-macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/hillshade-shadow-color/zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/bottom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/center/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/center/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/center/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json
index 06c60d080b..06c60d080b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/top-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-anchor/top/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-anchor/top/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json
index 4c633b4237..4c633b4237 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-blur/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/multiply/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json
index 77eaf96958..77eaf96958 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-color/transparent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-width/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-width/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json
index 7f17773165..7f17773165 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json
index 836b87b16e..836b87b16e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-halo-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
index 9689f98407..9689f98407 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/icon-sdf-non-sdf-one-layer/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/image-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable-content/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json
index 253fc965aa..253fc965aa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/stretchable/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-image/token/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json
index c291562544..c291562544 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-image/token/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-image/token/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json
index ef86c597d3..ef86c597d3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-offset/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-offset/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-offset/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-offset/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/icon-only/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json
index 0760437163..0760437163 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-and-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json
index 9ff18b8ec1..9ff18b8ec1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-opacity/text-only/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/auto-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/map-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-alignment/viewport-rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pitch-scaling/rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
index f1cb4ead5f..f1cb4ead5f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-pixelratio-mismatch/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotate/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
index 6d7c07c46a..6d7c07c46a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotate/with-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
index fdaf27673e..fdaf27673e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-plain/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-high-base-sdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-plain/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/camera-function-sdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-plain/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json
index ff10b87fe6..ff10b87fe6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/composite-function-sdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json
index 6e8125cf62..6e8125cf62 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-plain/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json
index 18164e288a..18164e288a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-size/property-function-sdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
index 533e640ba8..533e640ba8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor-text-fit/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
index 27c166e4fa..27c166e4fa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision-variable-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json
index f8a34973b4..f8a34973b4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-collision/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
index 60e56e89fb..60e56e89fb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-icon-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both-text-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/both/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-both/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-height/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json
index d6bdd89b21..d6bdd89b21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/enlargen-width/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height-text-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/height/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json
index f879907a01..f879907a01 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
index 37cfb3b5fd..37cfb3b5fd 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-fifteen-part/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
index 52972bf07e..52972bf07e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-@2x/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content-collision/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
index a96054ffb9..a96054ffb9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-content/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-height/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
index c410a69d19..c410a69d19 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part-just-width/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
index 5bec05e584..5bec05e584 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-nine-part/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
index 0cd910a99a..0cd910a99a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-three-part/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
index 3e848e8533..3e848e8533 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-two-part/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
index 6048fc7e0b..6048fc7e0b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/stretch-underscale/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
index 3c52c61f52..3c52c61f52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/text-variable-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor-padding/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
index fd38a33aaf..fd38a33aaf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width-text-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json
index 3731e0fcb2..3731e0fcb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-text-fit/width/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json
index 40b289ac73..40b289ac73 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/icon-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/default/metrics.json b/metrics/macos-xcode11-release/render-tests/image/default/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json
index 40cff205c7..40cff205c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-brightness/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-brightness/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-contrast/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-contrast/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-hue-rotate/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-resampling/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-resampling/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-saturation/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-saturation/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/image/raster-visibility/metrics.json b/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
index e64a2bba0e..e64a2bba0e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/image/raster-visibility/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json b/metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/is-supported-script/filter/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json b/metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json
index f7dd7ee4c0..f7dd7ee4c0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/is-supported-script/layout/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-blur/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-blur/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-blur/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-blur/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-blur/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-blur/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-blur/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-blur/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-cap/butt/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-cap/butt/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-cap/butt/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-cap/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json
index b8fd663961..b8fd663961 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-cap/round/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-cap/round/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-cap/square/metrics.json b/metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-cap/square/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-cap/square/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json
index 870d30daeb..870d30daeb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-color/property-function-identity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json
index b8b502e177..b8b502e177 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json
index f116462d86..f116462d86 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/fractional-zoom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-composite-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
index a687132530..a687132530 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-constant/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/function/line-width-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
index 089003ecce..089003ecce 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-composite-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
index 45bcb8f0af..45bcb8f0af 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-constant/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
index 2b8782c818..2b8782c818 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
index fc7077f38f..fc7077f38f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/literal/line-width-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json
index 22bd3284bd..22bd3284bd 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/long-segment/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json
index 747a2afbe1..747a2afbe1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/segments/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
index d3af311705..d3af311705 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/round/zero-gap-width/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json
index 5e55b94da8..5e55b94da8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/slant/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json b/metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json
index b4f03708c4..b4f03708c4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-dasharray/zoom-history/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gap-width/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gap-width/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gap-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gap-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gradient/gradient/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json
index 2452c64b4a..2452c64b4a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-gradient/translucent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/bevel-transparent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/bevel/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/bevel/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/bevel/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/miter-transparent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/miter/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json
index 418bfd0dac..418bfd0dac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/miter/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/miter/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json
index c43da97741..c43da97741 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/property-function-dasharray/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json
index 58f534192f..58f534192f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/round-transparent/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-join/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json
index 8bb30bb81b..8bb30bb81b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-join/round/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-join/round/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-offset/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-offset/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-offset/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-offset/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-offset/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-offset/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-offset/literal-negative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-offset/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-offset/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-offset/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-offset/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json
index d3fc353795..d3fc353795 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json
index 3a79bf0708..3a79bf0708 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json b/metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json
index 49ecdaab98..49ecdaab98 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-opacity/step-curve/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json
index 5163e6758e..5163e6758e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/@2x/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json
index d4020db05c..d4020db05c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/opacity/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json
index d108f774d1..d108f774d1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/pitch/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json
index 136c147615..136c147615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json
index fbbd2176a9..fbbd2176a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/step-curve/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json
index 94e778f0b4..94e778f0b4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pattern/zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pitch/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pitch/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pitch/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch0/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch15/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pitch/pitch30/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json b/metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-pitch/pitchAndBearing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json
index 12a7598851..12a7598851 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-sort-key/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-triangulation/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json
index 8e3ab38a23..8e3ab38a23 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-triangulation/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-triangulation/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-triangulation/round/metrics.json b/metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json
index 9d54981560..9d54981560 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-triangulation/round/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-triangulation/round/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json
index 5500efb294..5500efb294 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json
index 37218777d2..37218777d2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json
index e66ff128ba..e66ff128ba 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json
index b93dcb8232..b93dcb8232 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/very-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json
index c6cefecd17..c6cefecd17 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/zero-width-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/line-width/zero-width/metrics.json b/metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json
index 2712b0b4fe..2712b0b4fe 100644
--- a/metrics/next-macos-xcode11-release/render-tests/line-width/zero-width/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/line-width/zero-width/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
index bf9483fb78..bf9483fb78 100644
--- a/metrics/next-macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/linear-filter-opacity-edge/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/map-mode/static/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json
index 290ed6328f..290ed6328f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/map-mode/static/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/map-mode/static/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
index 199ebad897..199ebad897 100644
--- a/metrics/next-macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/map-mode/tile-avoid-edges/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/map-mode/tile/metrics.json b/metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json
index 3510a6a2db..3510a6a2db 100644
--- a/metrics/next-macos-xcode11-release/render-tests/map-mode/tile/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/map-mode/tile/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json
index da78bc6af7..da78bc6af7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/projection/axonometric-multiple/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/projection/axonometric/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-macos-xcode11-release/render-tests/projection/axonometric/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/projection/axonometric/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/projection/perspective/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-macos-xcode11-release/render-tests/projection/perspective/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/projection/perspective/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/projection/skew/metrics.json b/metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json
index b82f4dfc18..b82f4dfc18 100644
--- a/metrics/next-macos-xcode11-release/render-tests/projection/skew/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/projection/skew/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-alpha/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json
index 08d8297db8..08d8297db8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-alpha/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-alpha/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-brightness/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-brightness/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-brightness/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-contrast/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-contrast/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-contrast/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-extent/maxzoom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-extent/minzoom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-hue-rotate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-loading/missing/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json
index 4bd248b8fa..4bd248b8fa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-loading/missing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-loading/missing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json
index 12c856a698..12c856a698 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping-vector/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json
index c0ad63d409..c0ad63d409 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-masking/overlapping/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-resampling/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-resampling/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json
index 72910f7b10..72910f7b10 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-resampling/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/0/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/0/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-rotation/0/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/180/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/180/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-rotation/180/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/270/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/270/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-rotation/270/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/45/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json
index b4c21ad5c9..b4c21ad5c9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/45/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-rotation/45/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/90/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json
index 0d1ecd1833..0d1ecd1833 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-rotation/90/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-rotation/90/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/default/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-saturation/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/function/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-saturation/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-saturation/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json
index db64850e38..db64850e38 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/raster-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/real-world/nepal/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json
index f1142e011c..f1142e011c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/real-world/nepal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/real-world/nepal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/real-world/norway/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json
index 45badb494a..45badb494a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/real-world/norway/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/real-world/norway/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/real-world/uruguay/metrics.json b/metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json
index 8c183cc9f3..8c183cc9f3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/real-world/uruguay/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/real-world/uruguay/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
index 96bd9fd98f..96bd9fd98f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2305/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
index a48098b4aa..a48098b4aa 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2523/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
index c527b4e09d..c527b4e09d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2533/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
index 7d15d2a7ad..7d15d2a7ad 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2534/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2787/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
index 19c5ef8507..19c5ef8507 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2846/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
index 2052d5d52e..2052d5d52e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#2929/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3010/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
index fab92536d4..fab92536d4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3107/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
index bcc2a3f74f..bcc2a3f74f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3320/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
index 09d52d402e..09d52d402e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3365/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
index 65f07ee533..65f07ee533 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3394/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
index c217fdfc61..c217fdfc61 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3426/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
index 6e40c94905..6e40c94905 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3548/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
index 3520563149..3520563149 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3612/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3614/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
index bc237525bb..bc237525bb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3623/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3633/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
index 16485ab8b4..16485ab8b4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3682/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
index 0500eb4873..0500eb4873 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3702/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
index a01add499e..a01add499e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3723/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3819/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3903/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
index f9443ff76e..f9443ff76e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3910/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#3949/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4124/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4144/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4146/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
index 485b59ab36..485b59ab36 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4150/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
index 3468eac0f2..3468eac0f2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4172/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
index ba3ca00114..ba3ca00114 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4235/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4550/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
index b3e8b26951..b3e8b26951 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4551/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
index 54f55f390d..54f55f390d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4564/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
index 20c05495d7..20c05495d7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4573/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4579/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4605/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
index 026b6be031..026b6be031 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4617/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4647/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
index 77e26663ad..77e26663ad 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4651/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
index 2a11129cdd..2a11129cdd 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4860/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
index e78c748008..e78c748008 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#4928/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5370/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
index 5e66f07df0..5e66f07df0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5466/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5496/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
index 20fa03d324..20fa03d324 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5544/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
index 6b144b9538..6b144b9538 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5546/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
index 63e089963e..63e089963e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5576/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
index 4ab1b5696c..4ab1b5696c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5599/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
index 7ce4c13248..7ce4c13248 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5631/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
index 2ce8e21873..2ce8e21873 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5776/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
index 25b998e4f8..25b998e4f8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
index e9fe2a688c..e9fe2a688c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5911a/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
index 9c7a3359c2..9c7a3359c2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5947/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5953/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
index 7b8e778406..7b8e778406 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#5978/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
index f8108ef92f..f8108ef92f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6160/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6238/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
index 64d5fea021..64d5fea021 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6548/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
index 89aa855d36..89aa855d36 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6649/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6660/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
index 2e13bfe1c8..2e13bfe1c8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#6919/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
index 693f787042..693f787042 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7032/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#7172/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
index 2e92924579..2e92924579 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#8273/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
index a5407ceb76..a5407ceb76 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-js#9009/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
index a80aa837e4..a80aa837e4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#10849/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
index 501f64a004..501f64a004 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11451/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
index 0be45de845..0be45de845 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#11729/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
index 89ccfdbed1..89ccfdbed1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#12812/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
index 98442c7f49..98442c7f49 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#14402/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
index 5cb2eb8428..5cb2eb8428 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#15139/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#3292/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
index fb4e5552f7..fb4e5552f7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5648/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5701/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#5754/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
index ad0cf8a267..ad0cf8a267 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6063/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6233/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
index daa3b24ba1..daa3b24ba1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6820/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
index e85e6b42dc..e85e6b42dc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#6903/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7241/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
index 38eab4e78e..38eab4e78e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7572/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
index 2bd3523e27..2bd3523e27 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7714/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#7792/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
index 16c62d33f5..16c62d33f5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8078/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8303/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
index d4eae54455..d4eae54455 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8460/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8505/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8871/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#8952/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
index 4e5b247b07..4e5b247b07 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9406/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
index 7f54e74803..7f54e74803 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9557/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
index 6de6aa8e28..6de6aa8e28 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9792/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
index 662a5ca35c..662a5ca35c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9900/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
index 4b5fdfaa4a..4b5fdfaa4a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9976/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
index 5068fa89b0..5068fa89b0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-native#9979/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
index eb891b578e..eb891b578e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/regressions/mapbox-gl-shaders#37/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json
index 3653638ee2..3653638ee2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/remove-feature-state/composite-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json
index f6bec0e045..f6bec0e045 100644
--- a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/remove-feature-state/data-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json b/metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json
index 16026daceb..16026daceb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/remove-feature-state/vector-source/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/retina-raster/default/metrics.json b/metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/retina-raster/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/retina-raster/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-default-to-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-false-to-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/filter-true-to-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
index 4deb44f270..4deb44f270 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-1x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
index 6faf862e93..6faf862e93 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-1x-image-2x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-1x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
index e0baa0c9f5..e0baa0c9f5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-2x-image-2x-screen/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json
index 7b309facc7..7b309facc7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-alpha/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-nonsdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json
index b6e30d5e33..b6e30d5e33 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json
index 672f6c43ed..672f6c43ed 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-add-sdf/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json
index ac4b3251ff..ac4b3251ff 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-remove/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json
index 9b2e396f8e..9b2e396f8e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json
index 31a94a030d..31a94a030d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/image-update-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json
index ca19895c81..ca19895c81 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-background/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-raster/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-add-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-background/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-raster/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layer-remove-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
index c4c12ce6cc..c4c12ce6cc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
index ded111d5db..ded111d5db 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-override-paint-property-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
index 7c2bcc88a9..7c2bcc88a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-text-variable-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
index 23b829f168..23b829f168 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
index 47108b29bc..47108b29bc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-default-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
index 9d89d5f2f3..9d89d5f2f3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-overriden-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-and-property-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
index 2b00a4fa06..2b00a4fa06 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-and-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-expression-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-default-to-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-false-to-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-filter-true-to-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
index dea2cb3857..dea2cb3857 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-glyphs/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-background/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
index 873f47815f..873f47815f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
index bb8ac85388..bb8ac85388 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-raster/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-add-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
index e0426e7b51..e0426e7b51 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-layer/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
index e204a192de..e204a192de 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source-type/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-change-source/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-background/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-circle/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-fill/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-raster/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
index d1d3c719b6..d1d3c719b6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-remove-symbol/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
index ecd1b9eaf5..ecd1b9eaf5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layer-reorder/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
index 43f81ae9e8..43f81ae9e8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
index 7d39e18295..7d39e18295 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
index fea6fe2e59..fea6fe2e59 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-layout-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-default-to-zoom-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
index 869c4378bf..869c4378bf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
index bf5b94a725..bf5b94a725 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-literal-to-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
index b7fcd04541..b7fcd04541 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-property-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-paint-property-zoom-function-to-literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-geojson-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-raster-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-add-vector-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-source-update/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json
index 79e7810486..79e7810486 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-sprite/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-default-to-visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-none-to-visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/set-style-visibility-visible-to-none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
index 7f4a046639..7f4a046639 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-geojson-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
index 2e017e0a39..2e017e0a39 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
index 95c3df52a8..95c3df52a8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-raster-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
index 9028b81da1..9028b81da1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-inline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
index 848e2d81c4..848e2d81c4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/source-add-vector-url/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-default-to-visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-none-to-visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
index 2b08c32c8f..2b08c32c8f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/runtime-styling/visibility-visible-to-none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json b/metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json
index b3dedd944d..b3dedd944d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/satellite-v9/z0/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json b/metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json
index 04af83427d..04af83427d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sparse-tileset/overdraw/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/1x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
index 20bd7543c1..20bd7543c1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
index 450fd3b15f..450fd3b15f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-1x-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
index e962ac627e..e962ac627e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-icon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
index fb033edaf0..fb033edaf0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/sprites/2x-screen-2x-pattern/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/linestring/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multilinestring/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipoint/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json
index 9deff6e405..9deff6e405 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/multipolygon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json
index 10e4e9f2ba..10e4e9f2ba 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-geometry/polygon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json
index 2bdb228c52..2bdb228c52 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center-buffer/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
index 28402a2cc9..28402a2cc9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-center/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json
index daaadcdba2..daaadcdba2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json
index 95aa395c60..95aa395c60 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/point-polygon/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/point/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json
index 178821e1ca..178821e1ca 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-placement/point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-placement/point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json
index 6c810abb8a..6c810abb8a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/icon-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json
index 7298ff45e0..7298ff45e0 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
index c501cdfe8b..c501cdfe8b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-ignore-placement/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json
index b6cfd840ae..b6cfd840ae 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-sort-key/text-placement/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-close/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-far/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json
index 23e6cccadb..23e6cccadb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-spacing/line-overscaled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-close/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json
index bfed6ec297..bfed6ec297 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-spacing/point-far/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json
index 95a181bd8c..95a181bd8c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json
index 1de5e049d8..1de5e049d8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-z-order/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-z-order/disabled/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-z-order/icon-with-text/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json
index b5449900fc..b5449900fc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-z-order/pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json b/metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json
index 2acbad453c..2acbad453c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/symbol-z-order/viewport-y/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/bottom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/center/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/center/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/center/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json
index 6d769f5648..6d769f5648 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/top-left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/top-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top/metrics.json b/metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json
index 7cdd3a4812..7cdd3a4812 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-anchor/top/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-anchor/top/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json
index 932066a29f..932066a29f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-arabic/letter-spacing/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json
index ed9a135831..ed9a135831 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break-mixed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json
index 8ebd514b42..8ebd514b42 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-arabic/line-break/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json
index a2ea9c5fb7..a2ea9c5fb7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-arabic/mixed-numeric/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json b/metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json
index 987740be5e..987740be5e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-arabic/multi-paragraph/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json
index 60c3ad345f..60c3ad345f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json
index 526f4071d8..526f4071d8 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-arabic/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json
index 62c000b290..62c000b290 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-constant-size/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json
index a02d067247..a02d067247 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json
index 137e66bf14..137e66bf14 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-multiline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
index a56a73a714..a56a73a714 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json
index 197cdb9b50..197cdb9b50 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-vertical/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
index 4b81074408..4b81074408 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json
index 52b1978f29..52b1978f29 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-images/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json
index 089da63a88..089da63a88 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
index 128115bae7..128115bae7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides-nested-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
index 0f1b65a6db..0f1b65a6db 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color-overrides/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json
index 1640b2b40b..1640b2b40b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted-text-color/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json
index 883429ed73..883429ed73 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/formatted/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/formatted/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json
index f20b89d82f..f20b89d82f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-field/token/metrics.json b/metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json
index fa46462cc5..fa46462cc5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-field/token/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-field/token/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-font/camera-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-font/camera-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-font/camera-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-font/chinese/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json
index 46fdec9d05..46fdec9d05 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-font/chinese/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-font/chinese/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-font/data-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json
index aac1bbcfbc..aac1bbcfbc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-font/data-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-font/data-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-font/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-font/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-font/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-blur/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-blur/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-blur/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-blur/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-color/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-color/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-color/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json
index 47cea62594..47cea62594 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-color/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-width/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-width/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json
index 860834fedb..860834fedb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json
index 37f4af4128..37f4af4128 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-halo-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-justify/auto/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json
index 0f7801b2e4..0f7801b2e4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-justify/auto/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-justify/auto/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-justify/left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-justify/left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-justify/left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-justify/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json
index 5c1e774f37..5c1e774f37 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-justify/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-justify/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-justify/right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-justify/right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-justify/right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
index 1a478f9857..1a478f9857 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-rotated/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
index 2412b1cc57..2412b1cc57 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true-text-anchor/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json
index 8a117769b2..8a117769b2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/line-placement-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-map-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-false/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
index 68d8b35e75..68d8b35e75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-keep-upright/point-placement-align-viewport-true/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-close/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/function-far/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json
index 97d7f27021..97d7f27021 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
index fd1ea83213..fd1ea83213 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-letter-spacing/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-line-height/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json
index 41ff7515c7..41ff7515c7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-line-height/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-line-height/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json
index 9551aabb14..9551aabb14 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-angle/line-center/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json
index 2ad59dd984..2ad59dd984 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-angle/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/force-double-newline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json
index b553d8692d..b553d8692d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/force-newline/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json
index 4c0301c08d..4c0301c08d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-breaking/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
index e6477234cc..e6477234cc 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/ideographic-punctuation-breaking/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json
index 05279818ae..05279818ae 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json
index 8eef9a4166..8eef9a4166 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
index b95ec5af3c..b95ec5af3c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-max-width/zoom-and-property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json
index 563004e912..563004e912 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-no-cross-source-collision/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorcenter-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorleft-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifycenter-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyleft-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetnegative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
index 6ad395e0b5..6ad395e0b5 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal-multiline-anchorright-justifyright-offsetpositive/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-offset/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json
index 384ce4dadb..384ce4dadb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-offset/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-offset/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-opacity/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-opacity/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-opacity/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-opacity/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-opacity/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-opacity/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-opacity/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-opacity/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-opacity/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json
index 6734d0b046..6734d0b046 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-opacity/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-depthtest/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
index d05556cd14..d05556cd14 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
index edd93c6655..edd93c6655 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-overzoomed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
index 2292400be6..2292400be6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-depthtest/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json b/metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json
index 1514cee615..1514cee615 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-pitch-scaling/line-half/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json b/metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-radial-offset/basic/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-bottom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-left/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json
index 789eb531ac..789eb531ac 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/anchor-top/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json
index 0206fc826f..0206fc826f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json
index 0859331916..0859331916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
index ca4687f419..ca4687f419 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotate/with-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/auto-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/map-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
index 70ac3608a9..70ac3608a9 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
index 905846132d..905846132d 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-rotation-alignment/viewport-symbol-placement-point/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-high-base/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/camera-function-interval/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json
index be4621cd93..be4621cd93 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/composite-expression/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json
index 5c85a420f3..5c85a420f3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/composite-function-line-placement/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/composite-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/composite-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json
index bf6832d42b..bf6832d42b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-size/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json
index 84fc4fe605..84fc4fe605 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-size/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-size/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json
index 05d7f57555..05d7f57555 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-tile-edge-clipping/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json
index 2bf7d11354..2bf7d11354 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-transform/lowercase/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-transform/property-function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json
index 94f6c3ccd6..94f6c3ccd6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-transform/property-function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-transform/property-function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json b/metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json
index ecb7316699..ecb7316699 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-transform/uppercase/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json
index 9162d111f6..9162d111f6 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-translate-anchor/viewport/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-translate/default/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-translate/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-translate/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-translate/function/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-translate/function/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-translate/function/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-translate/literal/metrics.json b/metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json
index cd668f351a..cd668f351a 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-translate/literal/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-translate/literal/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
index 9953c2ea9e..9953c2ea9e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-icon-text-fit/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset-zero/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-radial-offset-zero/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
index dca033517b..dca033517b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-text-allow-overlap/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
index a7cc632922..a7cc632922 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-tile-map-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-negative/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset-zero/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
index dfa7520916..dfa7520916 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors-two-dimentional-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json
index 806d886e75..806d886e75 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/all-anchors/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image-all-anchors/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json
index 031fe71047..031fe71047 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-image/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
index 3a2c346277..3a2c346277 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/icon-text-fit-collision-box/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
index c4efa5911f..c4efa5911f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/no-animate-zoom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
index 415dfc131f..415dfc131f 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-rotated-debug/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched-with-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json
index b06ed0feb2..b06ed0feb2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/pitched/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-offset/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated-with-map/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json
index 33eed36df4..33eed36df4 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/rotated/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json
index 9dca847cbb..9dca847cbb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-justification/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json
index a8acd89723..a8acd89723 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/single-line/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
index 40b67f1445..40b67f1445 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/text-allow-overlap/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
index 74f5df99b3..74f5df99b3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-variable-anchor/top-bottom-left-right/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-visibility/none/metrics.json b/metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json
index 7da0796966..7da0796966 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-visibility/none/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-visibility/none/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-visibility/visible/metrics.json b/metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json
index d7ff42c127..d7ff42c127 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-visibility/visible/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-visibility/visible/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
index 4da17ca35c..4da17ca35c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese-punctuation/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
index 4c978ab6c2..4c978ab6c2 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/chinese/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json
index 8c2cc0dbcb..8c2cc0dbcb 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/latin/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
index caf18baec7..caf18baec7 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/line_label/mixed/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
index 23e8621fe3..23e8621fe3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-arabic-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-horizontal-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
index eabb4022be..eabb4022be 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
index 25fb8b4d1e..25fb8b4d1e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-punctuation-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
index d8ccbe177b..d8ccbe177b 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
index 632a29ad17..632a29ad17 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
index 7d4c49afdf..7d4c49afdf 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/cjk-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
index 5cf22c6b3e..5cf22c6b3e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/latin-vertical-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
index ad6e567fda..ad6e567fda 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fit/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
index c1486937e1..c1486937e1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
index 9ff0b2697c..9ff0b2697c 100644
--- a/metrics/next-macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/tilejson-bounds/overwrite-bounds/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/tms/tms/metrics.json b/metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json
index f7ca11c232..f7ca11c232 100644
--- a/metrics/next-macos-xcode11-release/render-tests/tms/tms/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/tms/tms/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-history/in/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-history/in/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-history/in/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-history/out/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json
index ba820d16da..ba820d16da 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-history/out/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-history/out/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/above/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json
index d11ea20c71..d11ea20c71 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/below/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json
index ed48714735..ed48714735 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/in-range/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json
index 8fbd5d92e3..8fbd5d92e3 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/out-of-range/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json
index b51667187e..b51667187e 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-above/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json
index 01b432fe21..01b432fe21 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoom-visibility/was-below/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json
index ca6ff8e333..ca6ff8e333 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoomed-fill/default/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json
index 4859f4afb1..4859f4afb1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoomed-raster/fractional/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json
index 10305579d1..10305579d1 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoomed-raster/overzoom/metrics.json
diff --git a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json b/metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json
index 50f1262c46..50f1262c46 100644
--- a/metrics/next-macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json
+++ b/metrics/macos-xcode11-release/render-tests/zoomed-raster/underzoom/metrics.json
diff --git a/metrics/next-binary-size.json b/metrics/next-binary-size.json
deleted file mode 100644
index 05f9d2a7fe..0000000000
--- a/metrics/next-binary-size.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "base_test_path": "next-binary-size",
-    "metric_path": "next-binary-size"
-}
diff --git a/metrics/next-binary-size/linux-clang8/metrics.json b/metrics/next-binary-size/linux-clang8/metrics.json
deleted file mode 100644
index 51fcd437b9..0000000000
--- a/metrics/next-binary-size/linux-clang8/metrics.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "file-size": [
-        [
-            "mbgl-glfw",
-            "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-glfw",
-            6507720
-        ],
-        [
-            "mbgl-offline",
-            "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-offline",
-            5774024
-        ],
-        [
-            "mbgl-render",
-            "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-render",
-            6409144
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/next-binary-size/linux-clang8/style.json b/metrics/next-binary-size/linux-clang8/style.json
deleted file mode 100644
index f6d23490e6..0000000000
--- a/metrics/next-binary-size/linux-clang8/style.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "mbgl-render", "/tmp/attach/install/next-linux-clang8-release/bin/mbgl-render", 0.01]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {},
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "green"
-      }
-    }
-  ]
-}
diff --git a/metrics/next-binary-size/linux-gcc8/style.json b/metrics/next-binary-size/linux-gcc8/style.json
deleted file mode 100644
index abe8d6b779..0000000000
--- a/metrics/next-binary-size/linux-gcc8/style.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "mbgl-render", "/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-render", 0.01]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {},
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "green"
-      }
-    }
-  ]
-}
diff --git a/metrics/next-binary-size/macos-xcode11/metrics.json b/metrics/next-binary-size/macos-xcode11/metrics.json
deleted file mode 100644
index 27b3e3b452..0000000000
--- a/metrics/next-binary-size/macos-xcode11/metrics.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "file-size": [
-        [
-            "mbgl-glfw",
-            "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-glfw",
-            5562556
-        ],
-        [
-            "mbgl-offline",
-            "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-offline",
-            5427032
-        ],
-        [
-            "mbgl-render",
-            "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-render",
-            5477244
-        ]
-    ]
-}
diff --git a/metrics/next-binary-size/macos-xcode11/style.json b/metrics/next-binary-size/macos-xcode11/style.json
deleted file mode 100644
index cd2db87c48..0000000000
--- a/metrics/next-binary-size/macos-xcode11/style.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "mbgl-glfw", "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "mbgl-offline", "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "mbgl-render", "/tmp/attach/install/next-macos-xcode11-release/bin/mbgl-render", 0.01]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {},
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "green"
-      }
-    }
-  ]
-}
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp
index 8d9c9e4838..2e6047d0a8 100644
--- a/platform/android/src/test/render_test_runner.cpp
+++ b/platform/android/src/test/render_test_runner.cpp
@@ -50,8 +50,8 @@ void android_main(struct android_app* app) {
             return result;
         };
 
-        auto result = runTestWithManifest("/metrics/next-android-render-test-runner-metrics.json");
-        result = runTestWithManifest("/metrics/next-android-render-test-runner-style.json") && result;
+        auto result = runTestWithManifest("/metrics/android-render-test-runner-metrics.json");
+        result = runTestWithManifest("/metrics/android-render-test-runner-style.json") && result;
         mbgl::Log::Info(mbgl::Event::General, "All tests are finished!");
         changeState(env, app, result);
     }
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 3f1dce02a5..29b6315cc5 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -3,8 +3,8 @@ mapbox-gl-js/test/integration/query-tests/
 metrics/expectations/
 metrics/ignores/
 metrics/tests/
-metrics/next-android-render-test-runner/
-metrics/next-android-render-test-runner-metrics.json
-metrics/next-android-render-test-runner-style.json
+metrics/android-render-test-runner/
+metrics/android-render-test-runner-metrics.json
+metrics/android-render-test-runner-style.json
 metrics/cache-metrics.db
 metrics/cache-style.db
diff --git a/render-test/ios/iosTestRunner.mm b/render-test/ios/iosTestRunner.mm
index 5c0365d367..3fe16c1d8e 100644
--- a/render-test/ios/iosTestRunner.mm
+++ b/render-test/ios/iosTestRunner.mm
@@ -76,8 +76,8 @@
 
             std::string basePath = std::string([path UTF8String]);
             self.testStatus = self.runner->startTest(basePath) ? YES : NO;
-            self.styleResultPath =  [path stringByAppendingPathComponent:@"/next-ios-render-test-runner-style.html"];
-            self.metricResultPath =  [path stringByAppendingPathComponent:@"/next-ios-render-test-runner-metrics.html"];
+            self.styleResultPath =  [path stringByAppendingPathComponent:@"/ios-render-test-runner-style.html"];
+            self.metricResultPath =  [path stringByAppendingPathComponent:@"/ios-render-test-runner-metrics.html"];
 
             BOOL fileFound = [fileManager fileExistsAtPath: self.styleResultPath];
             if (fileFound == NO) {
diff --git a/render-test/ios/ios_test_runner.cpp b/render-test/ios/ios_test_runner.cpp
index ceb44440aa..bb93db489d 100644
--- a/render-test/ios/ios_test_runner.cpp
+++ b/render-test/ios/ios_test_runner.cpp
@@ -35,8 +35,8 @@ bool TestRunner::startTest(const std::string& manifestBasePath) {
 
     bool status = false;
     try {
-        status = runTestWithManifest(manifestBasePath + "/next-ios-render-test-runner-style.json");
-        status = runTestWithManifest(manifestBasePath + "/next-ios-render-test-runner-metrics.json") && status;
+        status = runTestWithManifest(manifestBasePath + "/ios-render-test-runner-style.json");
+        status = runTestWithManifest(manifestBasePath + "/ios-render-test-runner-metrics.json") && status;
     } catch (...) {
         mbgl::Log::Info(mbgl::Event::General, "Failed with exception");
     }
diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh
index a7d56827ce..fbce92f85f 100755
--- a/render-test/ios/setup_test_data.sh
+++ b/render-test/ios/setup_test_data.sh
@@ -9,8 +9,8 @@ cp -r ../../mapbox-gl-js/test/integration/query-tests ../../test-data/integratio
 cp -r ../../metrics/expectations ../../test-data/
 cp -r ../../metrics/ignores ../../test-data/
 cp -r ../../metrics/tests ../../test-data/
-cp -r ../../metrics/next-ios-render-test-runner ../../test-data/
-cp -r ../../metrics/next-ios-render-test-runner-style.json ../../test-data/
-cp -r ../../metrics/next-ios-render-test-runner-metrics.json ../../test-data/
+cp -r ../../metrics/ios-render-test-runner ../../test-data/
+cp -r ../../metrics/ios-render-test-runner-style.json ../../test-data/
+cp -r ../../metrics/ios-render-test-runner-metrics.json ../../test-data/
 cp -r ../../metrics/cache-metrics.db ../../test-data/
-cp -r ../../metrics/cache-style.db ../../test-data/
\ No newline at end of file
+cp -r ../../metrics/cache-style.db ../../test-data/