diff --git a/.buildkite/pipeline.bb.yml b/.buildkite/pipeline.bb.yml
deleted file mode 100644
index 2830f95f4c..0000000000
--- a/.buildkite/pipeline.bb.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-steps:
-
-  #
-  # BitBar PoC
-  #
-  - label: ':android: BitBar Poc - Android 6 - batch 1'
-    soft_fail: true
-    depends_on: "fixture-r16"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture-r16.apk"
-          - "build/fixture-r16/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner-bitbar
-        run: android-maze-runner-bitbar
-        service-ports: true
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=build/fixture-r16.apk"
-          - "--farm=bb"
-          - "--device=ANDROID_6"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r16"
-    concurrency: 2
-    concurrency_group: 'bitbar-android-6'
-    concurrency_method: eager
-
-  - label: ':android: BitBar Poc - Android 6 - batch 2'
-    soft_fail: true
-    depends_on: "fixture-r16"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture-r16.apk"
-          - "build/fixture-r16/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner-bitbar
-        run: android-maze-runner-bitbar
-        service-ports: true
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=build/fixture-r16.apk"
-          - "--farm=bb"
-          - "--device=ANDROID_6"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r16"
-    concurrency: 2
-    concurrency_group: 'bitbar-android-6'
-    concurrency_method: eager
-
-  - label: ':android: BitBar Poc - Android 10 - batch 1'
-    depends_on: "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture-r21.apk"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner-bitbar
-        run: android-maze-runner-bitbar
-        service-ports: true
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=build/fixture-r21.apk"
-          - "--farm=bb"
-          - "--device=ANDROID_10"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 2
-    concurrency_group: 'bitbar-android-10'
-    concurrency_method: eager
-
-  - label: ':android: BitBar Poc - Android 10 - batch 2'
-    depends_on: "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture-r21.apk"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner-bitbar
-        run: android-maze-runner-bitbar
-        service-ports: true
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=build/fixture-r21.apk"
-          - "--farm=bb"
-          - "--device=ANDROID_10"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 2
-    concurrency_group: 'bitbar-android-10'
-    concurrency_method: eager
diff --git a/.buildkite/pipeline.bs.yml b/.buildkite/pipeline.bs.yml
deleted file mode 100644
index 29d1848e15..0000000000
--- a/.buildkite/pipeline.bs.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-steps:
-
-  - label: ':android: Android 4.4 NDK r16 smoke tests'
-    key: 'android-4-4-smoke'
-    depends_on: "fixture-r16"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r16_url.txt"
-          - "build/fixture-r16/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner-legacy
-        run: android-maze-runner-legacy
-        command:
-          - "features/smoke_tests"
-          - "--app=@/app/build/fixture_r16_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_4_4"
-          - "--fail-fast"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r16"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-
-  # No Android 6 devices available on BrowserStack
-
-  - label: ':android: Android 7 NDK r19 smoke tests'
-    key: 'android-7-smoke'
-    depends_on: "fixture-r19"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r19_url.txt"
-          - "build/fixture-r19/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/smoke_tests"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_7_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-
-  - label: ':android: Android 8.1 NDK r19 smoke tests'
-    key: 'android-8-1-smoke'
-    depends_on: "fixture-r19"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r19_url.txt"
-          - "build/fixture-r19/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/smoke_tests"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_8_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-
-  - label: ':android: Android 10 NDK r21 smoke tests'
-    key: 'android-10-smoke'
-    depends_on: "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r21_url.txt"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/smoke_tests"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_10_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-
-  - label: ':android: Android 11 NDK r21 smoke tests'
-    key: 'android-11-smoke'
-    depends_on: "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r21_url.txt"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/smoke_tests"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_11_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-
-  # Android 11+ devices have the GWP-ASAN tool enabled which randomly samples native memory
-  # to detect misuse (such as use-after-free, buffer overflow). If a failure is detected then
-  # the device will raise a SIGABRT mentioning GWP-ASAN - this can be investigated further
-  # by inspecting the devices logs.
-  - label: ':android: Android 12 NDK r21 end-to-end tests - batch 1'
-    depends_on:
-      - "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r21_url.txt"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_12_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-
-  - label: ':android: Android 12 NDK r21 end-to-end tests - batch 2'
-    depends_on:
-      - "fixture-r21"
-    timeout_in_minutes: 60
-    plugins:
-      artifacts#v1.9.0:
-        download:
-          - "build/fixture_r21_url.txt"
-          - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        command:
-          - "features/full_tests"
-          - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_12_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    env:
-      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
index 8926d46e64..92388bb2a9 100644
--- a/.buildkite/pipeline.full.yml
+++ b/.buildkite/pipeline.full.yml
@@ -8,6 +8,7 @@ steps:
     command: make fixture-minimal
 
   - label: ':android: Build Example App'
+    skip: 'Currently failing'
     timeout_in_minutes: 5
     agents:
       queue: macos-12-arm
@@ -29,7 +30,11 @@ steps:
       queue: macos-12-arm
     command: './gradlew clean assembleRelease check --scan'
 
-  - label: ':android: Minimal fixture end-to-end tests'
+  #
+  # BitBar steps
+  #
+
+  - label: ':bitbar: Minimal fixture end-to-end tests'
     depends_on: "fixture-minimal"
     timeout_in_minutes: 30
     plugins:
@@ -37,20 +42,23 @@ steps:
         download: "build/fixture-minimal.apk"
         upload: "maze_output/failed/**/*"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/minimal"
           - "--app=/app/build/fixture-minimal.apk"
-          - "--farm=bs"
-          - "--device=ANDROID_9_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+          - "--farm=bb"
+          - "--device=ANDROID_9"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Debug fixture smoke tests'
+  - label: ':bitbar: Debug fixture smoke tests'
     depends_on: "fixture-debug"
     timeout_in_minutes: 30
     plugins:
@@ -60,337 +68,576 @@ steps:
           - "build/fixture-debug/*"
         upload: "maze_output/failed/**/*"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/smoke_tests"
           - "--tags=debug-safe"
           - "--app=/app/build/fixture-debug.apk"
-          - "--farm=bs"
-          - "--device=ANDROID_9_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--farm=bb"
+          - "--device=ANDROID_9"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-debug"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  # No Android 6 devices available on BrowserStack
-
-  - label: ':android: Android 7 NDK r19 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 7 NDK r19 end-to-end tests - batch 1'
     depends_on: "fixture-r19"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r19_url.txt"
+          - "build/fixture-r19-url.txt"
           - "build/fixture-r19/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_7"
+          - "--no-tunnel"
+          - "--aws-public-ip"
           - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_7_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 7 NDK r19 end-to-end tests - batch 2'
+  - label: ':bitbar: Android 7 NDK r19 end-to-end tests - batch 2'
     depends_on: "fixture-r19"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r19_url.txt"
+          - "build/fixture-r19-url.txt"
           - "build/fixture-r19/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_7_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_7"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 8.1 NDK r19 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 8 NDK r19 end-to-end tests - batch 1'
     depends_on: "fixture-r19"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r19_url.txt"
+          - "build/fixture-r19-url.txt"
           - "build/fixture-r19/*"
         upload: "maze_output/failed/**/*"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_8"
+          - "--no-tunnel"
+          - "--aws-public-ip"
           - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_8_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 8.1 NDK r19 end-to-end tests - batch 2'
+  - label: ':bitbar: Android 8 NDK r19 end-to-end tests - batch 2'
     depends_on: "fixture-r19"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r19_url.txt"
+          - "build/fixture-r19-url.txt"
           - "build/fixture-r19/*"
         upload: "maze_output/failed/**/*"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r19_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_8_1"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_8"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 9 NDK r21 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 9 NDK r21 end-to-end tests - batch 1'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_9_0"
-          - "--appium-version=1.20.2"
-          - "--exclude=features/full_tests/[^a-k].*.feature"
           - "features/full_tests"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_9"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 9 NDK r21 end-to-end tests - batch 2'
+  - label: ':bitbar: Android 9 NDK r21 end-to-end tests - batch 2'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_9_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_9"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 10 NDK r21 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 10 NDK r21 end-to-end tests - batch 1'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_10_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_10"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 10 NDK r21 end-to-end tests - batch 2'
+  - label: ':bitbar: Android 10 NDK r21 end-to-end tests - batch 2'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_10_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_10"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
   # Android 11+ devices have the GWP-ASAN tool enabled which randomly samples native memory
   # to detect misuse (such as use-after-free, buffer overflow). If a failure is detected then
   # the device will raise a SIGABRT mentioning GWP-ASAN - this can be investigated further
   # by inspecting the devices logs.
-  - label: ':android: Android 11 NDK r21 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 11 NDK r21 end-to-end tests - batch 1'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_11_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_11"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 11 NDK r21 end-to-end tests - batch 2'
+  - label: ':bitbar: Android 11 NDK r21 end-to-end tests - batch 2'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
-          - "--farm=bs"
-          - "--device=ANDROID_11_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_11"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
-  - label: ':android: Android 13 NDK r21 end-to-end tests - batch 1'
+  - label: ':bitbar: Android 13 NDK r21 end-to-end tests - batch 1'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_13"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 13 NDK r21 end-to-end tests - batch 2'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^l-z].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_13"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 14 NDK r21 end-to-end tests - batch 1'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^a-k].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_14"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 14 NDK r21 end-to-end tests - batch 2'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^l-z].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_14"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 15 NDK r21 end-to-end tests - batch 1'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_15"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 15 NDK r21 end-to-end tests - batch 2'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^l-z].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_15"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':browserstack: Android 16 NDK r21 end-to-end tests - batch 1'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/bs-fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          - "--exclude=features/full_tests/anr.feature"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
           - "--farm=bs"
-          - "--device=ANDROID_13_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--device=ANDROID_16"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
+    concurrency: 5
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-  - label: ':android: Android 13 NDK r21 end-to-end tests - batch 2'
+  - label: ':browserstack: Android 16 NDK r21 end-to-end tests - batch 2'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture_r21_url.txt"
+          - "build/bs-fixture-r21-url.txt"
           - "build/fixture-r21/*"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
       docker-compose#v4.7.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
         command:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
-          - "--app=@/app/build/fixture_r21_url.txt"
+          - "--exclude=features/full_tests/anr.feature"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
           - "--farm=bs"
-          - "--device=ANDROID_13_0"
-          - "--appium-version=1.20.2"
-          - "--fail-fast"
+          - "--device=ANDROID_16"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 24
+    concurrency: 5
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2e84786a14..c2aff79bc2 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -13,12 +13,12 @@ steps:
       queue: macos-12-arm
     artifact_paths:
       - "build/fixture-r16.apk"
-      - "build/fixture_r16_url.txt"
+      - "build/fixture-r16-url.txt"
       - "build/fixture-r16/*"
     commands:
       - bundle install
       - make fixture-r16
-      - bundle exec upload-app --app=./build/fixture-r16.apk --app-id-file=build/fixture_r16_url.txt
+      - bundle exec upload-app --farm=bb --app=./build/fixture-r16.apk --app-id-file=build/fixture-r16-url.txt
 
   - label: ':android: Build fixture APK r19'
     key: "fixture-r19"
@@ -27,12 +27,12 @@ steps:
       queue: macos-12-arm
     artifact_paths:
       - "build/fixture-r19.apk"
-      - "build/fixture_r19_url.txt"
+      - "build/fixture-r19-url.txt"
       - "build/fixture-r19/*"
     commands:
       - bundle install
       - make fixture-r19
-      - bundle exec upload-app --app=./build/fixture-r19.apk --app-id-file=build/fixture_r19_url.txt
+      - bundle exec upload-app --farm=bb --app=./build/fixture-r19.apk --app-id-file=build/fixture-r19-url.txt
 
   - label: ':android: Build fixture APK r21'
     key: "fixture-r21"
@@ -41,12 +41,14 @@ steps:
       queue: macos-12-arm
     artifact_paths:
       - "build/fixture-r21.apk"
-      - "build/fixture_r21_url.txt"
+      - "build/fixture-r21-url.txt"
+      - "build/bs-fixture-r21-url.txt"
       - "build/fixture-r21/*"
     commands:
       - bundle install
       - make fixture-r21
-      - bundle exec upload-app --app=./build/fixture-r21.apk --app-id-file=build/fixture_r21_url.txt
+      - bundle exec upload-app --farm=bb --app=./build/fixture-r21.apk --app-id-file=build/fixture-r21-url.txt
+      - bundle exec upload-app --farm=bs --app=./build/fixture-r21.apk --app-id-file=build/bs-fixture-r21-url.txt
 
   - label: ':android: Coding standards checks'
     timeout_in_minutes: 20
@@ -54,6 +56,13 @@ steps:
       queue: macos-12-arm
     command: './gradlew --continue checkstyle detekt lint ktlintCheck'
 
+  - label: ':android: Binary compatibility checks'
+    skip: 'Currently failing'
+    timeout_in_minutes: 20
+    agents:
+      queue: macos-12-arm
+    command: './gradlew apiCheck'
+
   - label: ':android: CppCheck'
     timeout_in_minutes: 10
     agents:
@@ -86,7 +95,344 @@ steps:
       queue: macos-12-arm
     command: './gradlew test'
 
+  #
+  # BitBar steps
+  #
+  - label: ':bitbar: Android 7 NDK r19 smoke tests'
+    depends_on: "fixture-r19"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r19-url.txt"
+          - "build/fixture-r19/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_7"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 8 NDK r19 smoke tests'
+    depends_on: "fixture-r19"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r19-url.txt"
+          - "build/fixture-r19/*"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r19-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_8"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 9 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_9"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 10 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_10"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 11 NDK r21 smoke tests'
+    key: 'android-11-smoke'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_11"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+ # Android 11+ devices have the GWP-ASAN tool enabled which randomly samples native memory
+  # to detect misuse (such as use-after-free, buffer overflow). If a failure is detected then
+  # the device will raise a SIGABRT mentioning GWP-ASAN - this can be investigated further
+  # by inspecting the devices logs.
+  - label: ':bitbar: Android 12 NDK r21 end-to-end tests - batch 1'
+    depends_on:
+      - "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_12"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 12 NDK r21 end-to-end tests - batch 2'
+    depends_on:
+      - "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^l-z].*.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_12"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 13 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_13"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 14 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_14"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 15 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--farm=bb"
+          - "--device=ANDROID_15"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          #- "--fail-fast"
+          - "--appium-version=1.22"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':browserstack: Android 16 NDK r21 smoke tests'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 30
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/bs-fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        command:
+          - "features/smoke_tests"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
+          - "--farm=bs"
+          - "--device=ANDROID_16"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 5
+    concurrency_group: 'browserstack-app'
+    concurrency_method: eager
+
   - label: 'Conditionally include device farms/full tests'
     agents:
-      queue: macos-12-arm
+      queue: macos
     command: sh -c .buildkite/pipeline_trigger.sh
+
diff --git a/.buildkite/pipeline_trigger.sh b/.buildkite/pipeline_trigger.sh
index 62dfaf8f12..0025976310 100755
--- a/.buildkite/pipeline_trigger.sh
+++ b/.buildkite/pipeline_trigger.sh
@@ -11,15 +11,3 @@ else
   # Basic build, but allow a full build to be triggered
   buildkite-agent pipeline upload .buildkite/block.step.yml
 fi
-
-# Run BrowserStack steps unless instructed not to
-if [[ "$BUILDKITE_MESSAGE" != *"[nobs]"* &&
-      "$DEVICE_FARM" != *"NO_BS"* ]]; then
-  buildkite-agent pipeline upload .buildkite/pipeline.bs.yml
-fi
-
-# Run BitBar steps if instructed to
-if [[ "$BUILDKITE_MESSAGE" == *"[bb]"* ||
-      "$DEVICE_FARM" == *"BB"* ]]; then
-  buildkite-agent pipeline upload .buildkite/pipeline.bb.yml
-fi
diff --git a/Gemfile b/Gemfile
index 7253ab1271..171f8c0028 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 #gem 'bugsnag-maze-runner', path: '../maze-runner'
 
 # Or a specific release:
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.17.0'
+gem 'bugsnag-maze-runner', '~>8.0'
 
 # Or follow master:
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner'
diff --git a/docker-compose.yml b/docker-compose.yml
index 71495da2c9..008b391fc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,24 @@
 version: '3.6'
-services:
 
+x-common-environment: &common-environment
+  DEBUG:
+  BUILDKITE:
+  BUILDKITE_BRANCH:
+  BUILDKITE_BUILD_CREATOR:
+  BUILDKITE_BUILD_NUMBER:
+  BUILDKITE_BUILD_URL:
+  BUILDKITE_JOB_ID:
+  BUILDKITE_LABEL:
+  BUILDKITE_MESSAGE:
+  BUILDKITE_PIPELINE_NAME:
+  BUILDKITE_PIPELINE_SLUG:
+  BUILDKITE_REPO:
+  BUILDKITE_RETRY_COUNT:
+  BUILDKITE_STEP_KEY:
+  MAZE_BUGSNAG_API_KEY:
+  TEST_FIXTURE_SYMBOL_DIR:
+
+services:
   android-common:
     build:
       context: .
@@ -28,49 +46,14 @@ services:
       PUBLISH_USER:
       PUBLISH_PASS:
 
-  android-maze-runner:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli
-    environment:
-      DEBUG:
-      BUILDKITE:
-      BUILDKITE_BRANCH:
-      BUILDKITE_BUILD_CREATOR:
-      BUILDKITE_BUILD_NUMBER:
-      BUILDKITE_BUILD_URL:
-      BUILDKITE_LABEL:
-      BUILDKITE_MESSAGE:
-      BUILDKITE_PIPELINE_NAME:
-      BUILDKITE_REPO:
-      BUILDKITE_RETRY_COUNT:
-      BUILDKITE_STEP_KEY:
-      MAZE_BUGSNAG_API_KEY:
-      BROWSER_STACK_USERNAME:
-      BROWSER_STACK_ACCESS_KEY:
-      TEST_FIXTURE_SYMBOL_DIR:
-    volumes:
-      - ./build:/app/build
-      - ./features/:/app/features/
-      - ./maze_output:/app/maze_output
-
-  android-maze-runner-bitbar:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:integration-bitbar-improvements-cli
+  maze-runner:
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli
     environment:
-      DEBUG:
-      BUILDKITE:
-      BUILDKITE_BRANCH:
-      BUILDKITE_BUILD_CREATOR:
-      BUILDKITE_BUILD_NUMBER:
-      BUILDKITE_BUILD_URL:
-      BUILDKITE_LABEL:
-      BUILDKITE_MESSAGE:
-      BUILDKITE_PIPELINE_NAME:
-      BUILDKITE_REPO:
-      BUILDKITE_RETRY_COUNT:
-      BUILDKITE_STEP_KEY:
-      MAZE_BUGSNAG_API_KEY:
+      <<: *common-environment
       BITBAR_USERNAME:
       BITBAR_ACCESS_KEY:
-      TEST_FIXTURE_SYMBOL_DIR:
+      BROWSER_STACK_USERNAME:
+      BROWSER_STACK_ACCESS_KEY:
     ports:
       - "9000-9499:9339"
     volumes:
@@ -79,31 +62,6 @@ services:
       - ./maze_output:/app/maze_output
       - /var/run/docker.sock:/var/run/docker.sock
 
-  android-maze-runner-legacy:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli-legacy
-    environment:
-      DEBUG:
-      BUILDKITE:
-      BUILDKITE_BRANCH:
-      BUILDKITE_BUILD_CREATOR:
-      BUILDKITE_BUILD_NUMBER:
-      BUILDKITE_BUILD_URL:
-      BUILDKITE_LABEL:
-      BUILDKITE_MESSAGE:
-      BUILDKITE_PIPELINE_NAME:
-      BUILDKITE_REPO:
-      BUILDKITE_RETRY_COUNT:
-      BUILDKITE_STEP_KEY:
-      MAZE_BUGSNAG_API_KEY:
-      BROWSER_STACK_USERNAME:
-      BROWSER_STACK_ACCESS_KEY:
-      TEST_FIXTURE_SYMBOL_DIR:
-      USE_LEGACY_DRIVER: 1
-    volumes:
-      - ./build:/app/build
-      - ./features/:/app/features/
-      - ./maze_output:/app/maze_output
-
   android-license-audit:
     build:
       context: .
diff --git a/features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/ConfigureStartupAnrScenario.kt b/features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/ConfigureStartupAnrScenario.kt
index 7ad0773e54..8b9a1a8fc6 100644
--- a/features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/ConfigureStartupAnrScenario.kt
+++ b/features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/ConfigureStartupAnrScenario.kt
@@ -14,6 +14,8 @@ class ConfigureStartupAnrScenario(
             .getSharedPreferences("AnrPreferences", Context.MODE_PRIVATE)
             .edit()
             .putLong("onCreateDelay", STARTUP_DELAY)
+            .putString("notify", config.endpoints.notify)
+            .putString("sessions", config.endpoints.sessions)
             .commit()
 
         exitProcess(0)
diff --git a/features/full_tests/auto_notify.feature b/features/full_tests/auto_notify.feature
index c11b9bd87c..677890ea06 100644
--- a/features/full_tests/auto_notify.feature
+++ b/features/full_tests/auto_notify.feature
@@ -23,7 +23,7 @@ Feature: Switching automatic error detection on/off for Unity
   Scenario: ANR not captured with autoDetectAnrs=false
     When I run "AutoDetectAnrsFalseScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     And I close and relaunch the app
     And I configure Bugsnag for "AutoDetectAnrsFalseScenario"
     Then Bugsnag confirms it has no errors to send
@@ -61,7 +61,7 @@ Feature: Switching automatic error detection on/off for Unity
     When I clear any error dialogue
     And I run "AutoDetectAnrsTrueScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     And I wait to receive an error
     Then the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the error payload field "events" is an array with 1 elements
diff --git a/features/full_tests/detect_anr_cxx.feature b/features/full_tests/detect_anr_cxx.feature
index 100ebd02c3..fdc0987cb9 100644
--- a/features/full_tests/detect_anr_cxx.feature
+++ b/features/full_tests/detect_anr_cxx.feature
@@ -8,7 +8,7 @@ Feature: ANRs triggered in CXX code are captured
   Scenario: ANR triggered in CXX code is captured
     When I run "CXXAnrScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the exception "errorClass" equals "ANR"
@@ -24,7 +24,7 @@ Feature: ANRs triggered in CXX code are captured
   Scenario: ANR triggered in CXX code is captured even when NDK detection is disabled
     When I run "CXXAnrNdkDisabledScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the exception "errorClass" equals "ANR"
diff --git a/features/full_tests/detect_anr_jvm.feature b/features/full_tests/detect_anr_jvm.feature
index b5bdab9edf..53569224c2 100644
--- a/features/full_tests/detect_anr_jvm.feature
+++ b/features/full_tests/detect_anr_jvm.feature
@@ -9,7 +9,7 @@ Feature: ANRs triggered in JVM code are captured
     When I clear any error dialogue
     And I run "JvmAnrLoopScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the exception "errorClass" equals "ANR"
@@ -29,7 +29,7 @@ Feature: ANRs triggered in JVM code are captured
     When I clear any error dialogue
     And I run "JvmAnrSleepScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the exception "errorClass" equals "ANR"
@@ -40,7 +40,7 @@ Feature: ANRs triggered in JVM code are captured
   Scenario: ANR triggered in JVM code is not captured when detectAnrs = false
     When I run "JvmAnrDisabledScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
     And the error payload field "events" is an array with 1 elements
@@ -50,5 +50,5 @@ Feature: ANRs triggered in JVM code are captured
   Scenario: ANR triggered in JVM code is not captured when outside of release stage
     When I run "JvmAnrOutsideReleaseStagesScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
-    Then I should receive no requests
+    And I cause the ANR dialog to appear
+    Then I should receive no errors
diff --git a/features/full_tests/discarded_events.feature b/features/full_tests/discarded_events.feature
index d8142b8d01..c831a6224f 100644
--- a/features/full_tests/discarded_events.feature
+++ b/features/full_tests/discarded_events.feature
@@ -60,7 +60,7 @@ Feature: Discarding events
     # Now there is no event on disk, so there's nothing to send.
     And I close and relaunch the app
     And I configure Bugsnag for "DiscardBigEventsScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Discard an on-disk error that received 400 and is too big
     # Fail to send initial handled error due to 400 error. Client discards it immediately.
diff --git a/features/full_tests/in_foreground.feature b/features/full_tests/in_foreground.feature
index a980ab02ca..54071890d7 100644
--- a/features/full_tests/in_foreground.feature
+++ b/features/full_tests/in_foreground.feature
@@ -3,6 +3,8 @@ Feature: In foreground field populates correctly
   Background:
     Given I clear all persistent data
 
+  # TODO: Skipped pending PLAT-10634
+  @skip
   Scenario: Test handled exception in background
     When I run "InForegroundScenario"
     And I send the app to the background for 5 seconds
diff --git a/features/full_tests/native_event_tracking.feature b/features/full_tests/native_event_tracking.feature
index 6ad6e58a02..bc6cddf742 100644
--- a/features/full_tests/native_event_tracking.feature
+++ b/features/full_tests/native_event_tracking.feature
@@ -12,6 +12,8 @@ Feature: Synchronizing app/device metadata in the native layer
     And the event "unhandled" is false
     And the "codeIdentifier" of stack frame 0 is not null
 
+  # TODO: Skipped pending PLAT-10634
+  @skip
   Scenario: Capture foreground state while in the background
     When I run "CXXBackgroundNotifyScenario"
     And I send the app to the background for 5 seconds
diff --git a/features/full_tests/startup_anr.feature b/features/full_tests/startup_anr.feature
index 2dcf1657bc..66c1d9887b 100644
--- a/features/full_tests/startup_anr.feature
+++ b/features/full_tests/startup_anr.feature
@@ -7,9 +7,11 @@ Feature: onCreate ANR
 # and then terminate the "misbehaving" app with a KILL (9) signal (almost like the ANR code doesn't
 # fire at all). Since we can't cover a KILL signal in a test, we skip Android 10.
   @skip_android_10
-# Android 13 Note: we no longer have permission to inject BACK button events, which are used to
+# Android 13+ Note: we no longer have permission to inject BACK button events, which are used to
 # trigger the ANR - so the test is not valid on Android 13 either
-  @skip_android_13
+  @skip_above_android_13
+  # Skipped - flaky
+  @skip
   Scenario: onCreate ANR is reported
     When I clear any error dialogue
     And I run "ConfigureStartupAnrScenario"
diff --git a/features/full_tests/strict_mode_violations.feature b/features/full_tests/strict_mode_violations.feature
index a486ae116c..8324319e9e 100644
--- a/features/full_tests/strict_mode_violations.feature
+++ b/features/full_tests/strict_mode_violations.feature
@@ -4,6 +4,8 @@ Feature: Reporting Strict Mode Violations
     Given I clear all persistent data
 
   @skip_below_android_9
+  # Skipped - flaky
+  @skip
   Scenario: StrictMode Exposed File URI violation
     When I run "StrictModeFileUriExposeScenario" and relaunch the crashed app
     And I configure Bugsnag for "StrictModeFileUriExposeScenario"
diff --git a/features/full_tests/trimming.feature b/features/full_tests/trimming.feature
index 938aa8f384..cd8c5b33f1 100644
--- a/features/full_tests/trimming.feature
+++ b/features/full_tests/trimming.feature
@@ -69,6 +69,8 @@ Feature: Excess data is trimmed when the payload is too big
     And the event "usage.system.breadcrumbsRemoved" equals 3
     And the event "usage.system.breadcrumbBytesRemoved" is not null
 
+  # Skipped - flaky
+  @skip
   Scenario: Payload is too big by 3 breadcrumbs, handled exception
     When I configure the app to run in the "handled, 10000, 100" state
     And I run "EventTooBigScenario"
diff --git a/features/minimal/detect_anr_minimal.feature b/features/minimal/detect_anr_minimal.feature
index ba8ec0d5c8..581ec3b84b 100644
--- a/features/minimal/detect_anr_minimal.feature
+++ b/features/minimal/detect_anr_minimal.feature
@@ -6,7 +6,7 @@ Feature: ANRs triggered in a fixture with only bugsnag-android-core are captured
   Scenario: Triggering ANR does not crash the minimal app
     When I run "JvmAnrMinimalFixtureScenario"
     And I wait for 2 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     And I wait for 4 seconds
     Then I wait to receive an error
     And the error is valid for the error reporting API version "4.0" for the "Android Bugsnag Notifier" notifier
diff --git a/features/smoke_tests/01_anr.feature b/features/smoke_tests/01_anr.feature
index b0228dc9e0..8b2646172f 100644
--- a/features/smoke_tests/01_anr.feature
+++ b/features/smoke_tests/01_anr.feature
@@ -7,9 +7,9 @@ Feature: ANR smoke test
     And I clear any error dialogue
     And I run "JvmAnrLoopScenario"
     And I wait for 1 seconds
-    And I tap the screen 3 times
+    And I cause the ANR dialog to appear
     And I wait for 5 seconds
-    And I tap the back-button 3 times
+    And I cause the ANR dialog to appear
     And I wait to receive an error
 
     # Exception details
diff --git a/features/steps/android_steps.rb b/features/steps/android_steps.rb
index 0a2b42b47c..23f9bacbee 100644
--- a/features/steps/android_steps.rb
+++ b/features/steps/android_steps.rb
@@ -120,22 +120,24 @@ def wait_for_app_state(expected_state)
   end
 end
 
+When('I cause the ANR dialog to appear') do
+  step 'I tap the screen 3 times'
+  step 'I press the back button'
+end
+
 When("I tap the screen {int} times") do |count|
   (1..count).each { |i|
     begin
       tap_at 500, 300
     rescue Selenium::WebDriver::Error::ElementNotInteractableError, Selenium::WebDriver::Error::InvalidElementStateError
-      # Ignore it§
+      # Ignore it
     end
     sleep(1)
   }
 end
 
-When("I tap the back-button {int} times") do |count|
-  (1..count).each { |i|
-    Maze.driver.back
-    sleep(0.5)
-  }
+When("I press the back button") do
+  Maze.driver.back
 end
 
 When("I configure the app to run in the {string} state") do |scenario_mode|
diff --git a/features/steps/symbol_steps.rb b/features/steps/symbol_steps.rb
index cc92dec67a..cc2db21afb 100644
--- a/features/steps/symbol_steps.rb
+++ b/features/steps/symbol_steps.rb
@@ -105,9 +105,10 @@ def lookup_address binary, address
 # if the frame is not in project.
 def symbolicate arch, frame
   method = demangle(frame["method"])
-  binary_file = frame["file"]&.split('!')&.last
+  raw_file = frame["file"]
+  binary_file = raw_file&.split('!')&.last
 
-  return nil if is_out_of_project?(binary_file, method)
+  return nil if is_out_of_project?(raw_file, method)
 
   symbol_file = File.join(SYMBOL_DIR, "#{File.basename(binary_file, '.so')}-#{arch}.so")
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 521ae59d0e..86b7977efe 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -52,8 +52,8 @@
   skip_this_scenario("Skipping scenario") if Maze.config.os_version < 5
 end
 
-Before('@skip_android_13') do |scenario|
-  skip_this_scenario("Skipping scenario") if Maze.config.os_version.floor == 13
+Before('@skip_above_android_13') do |scenario|
+  skip_this_scenario("Skipping scenario") if Maze.config.os_version.floor >= 13
 end
 
 Before('@skip_android_10') do |scenario|