diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 5edd84237..34be91506 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -13,6 +13,7 @@
 # │ macOS 14        │ iOS aarch64     │ cargo-makepad   │
 # │ macOS 14        │ Android         │ cargo-makepad   │
 # │ Ubuntu Latest   │ Android         │ cargo-makepad   │
+# │ Ubuntu Latest   │ Android armv7   │ cargo-makepad   │
 # │ Windows 2022    │ Android         │ cargo-makepad   │
 # └─────────────────┴─────────────────┴─────────────────┘
 
@@ -279,6 +280,42 @@ jobs:
           --config profile.dev.strip=true \
           --config profile.dev.debug-assertions=false
 
+  ## 32-bit ARM (armeabi-v7a), for devices whose Android userspace is 32-bit,
+  ## e.g. those that report `armv8l`. The other Android jobs build arm64 only.
+  build_android_armv7_on_linux:
+    name: Build Android armv7 (Linux Host)
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Setup cargo-makepad
+        uses: ./.github/actions/setup-cargo-makepad
+
+      - name: Install Android toolchain
+        run: |
+          cargo makepad android --abi=armv7 install-toolchain --full-ndk
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: android-armv7-linux-build-${{ hashFiles('Cargo.lock') }}
+
+      - name: Build Android APK
+        env:
+          RUSTFLAGS: "-D warnings"
+          AWS_LC_SYS_CMAKE_BUILDER: 1
+        run: |
+          cargo makepad android --abi=armv7 build -p robrix \
+          --config profile.dev.opt-level=0 \
+          --config profile.dev.debug=false \
+          --config profile.dev.lto=\"off\" \
+          --config profile.dev.strip=true \
+          --config profile.dev.debug-assertions=false
+
   build_android_on_windows:
     name: Build Android (Windows Host)
     runs-on: windows-2022
@@ -334,6 +371,7 @@ jobs:
       build_ios_on_macos,
       build_android_on_macos,
       build_android_on_linux,
+      build_android_armv7_on_linux,
       build_android_on_windows
     ]
     if: always()
@@ -349,6 +387,7 @@ jobs:
           echo "=== Android Builds ==="
           echo "Android (macOS): ${{ needs.build_android_on_macos.result }}"
           echo "Android (Linux): ${{ needs.build_android_on_linux.result }}"
+          echo "Android armv7 (Linux): ${{ needs.build_android_armv7_on_linux.result }}"
           echo "Android (Windows): ${{ needs.build_android_on_windows.result }}"
 
 concurrency:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 56afa6aaa..64983566c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,12 @@ on:
         type: boolean
         default: false
       build_android_aarch64:
-        description: 'Build Android APK (aarch64 only)'
+        description: 'Build Android APK (aarch64 / arm64-v8a)'
+        required: false
+        type: boolean
+        default: false
+      build_android_armv7:
+        description: 'Build Android APK (armv7 / armeabi-v7a, 32-bit ARM)'
         required: false
         type: boolean
         default: false
@@ -119,9 +124,12 @@ jobs:
       linux_matrix: ${{ steps.set.outputs.linux_matrix }}
       macos_matrix: ${{ steps.set.outputs.macos_matrix }}
       windows_matrix: ${{ steps.set.outputs.windows_matrix }}
+      android_matrix: ${{ steps.set.outputs.android_matrix }}
       run_linux: ${{ steps.set.outputs.run_linux }}
       run_macos: ${{ steps.set.outputs.run_macos }}
       run_windows: ${{ steps.set.outputs.run_windows }}
+      run_android: ${{ steps.set.outputs.run_android }}
+      android_version_code: ${{ steps.set.outputs.android_version_code }}
     steps:
       - name: Build matrix from inputs
         id: set
@@ -135,10 +143,14 @@ jobs:
             const linux = [];
             const macos = [];
             const windows = [];
+            const android = [];
 
             const addLinux = (os, arch) => linux.push({ os, arch });
             const addMacos = (os, arch) => macos.push({ os, arch });
             const addWindows = () => windows.push({ os: 'windows-2022', arch: 'x86_64' });
+            // `abi` is what makepad-packaging-action builds (and names the asset after);
+            // `target` is only passed along as the Rust target triple for that ABI.
+            const addAndroid = (abi, target) => android.push({ abi, target });
 
             if (isPush) {
               addLinux('ubuntu-24.04', 'x86_64');
@@ -148,6 +160,8 @@ jobs:
               addMacos('macos-14', 'aarch64');
               addMacos('macos-15-intel', 'x86_64');
               addWindows();
+              addAndroid('aarch64', 'aarch64-linux-android');
+              addAndroid('armv7', 'armv7-linux-androideabi');
             } else {
               if (enabled(inputs.build_ubuntu_24_x86_64)) addLinux('ubuntu-24.04', 'x86_64');
               if (enabled(inputs.build_ubuntu_24_aarch64)) addLinux('ubuntu-24.04-arm', 'aarch64');
@@ -156,14 +170,25 @@ jobs:
               if (enabled(inputs.build_macos_14_aarch64)) addMacos('macos-14', 'aarch64');
               if (enabled(inputs.build_macos_15_x86_64)) addMacos('macos-15-intel', 'x86_64');
               if (enabled(inputs.build_windows_2022_x86_64)) addWindows();
+              if (enabled(inputs.build_android_aarch64)) addAndroid('aarch64', 'aarch64-linux-android');
+              if (enabled(inputs.build_android_armv7)) addAndroid('armv7', 'armv7-linux-androideabi');
             }
 
             core.setOutput('linux_matrix', JSON.stringify({ include: linux }));
             core.setOutput('macos_matrix', JSON.stringify({ include: macos }));
             core.setOutput('windows_matrix', JSON.stringify({ include: windows }));
+            core.setOutput('android_matrix', JSON.stringify({ include: android }));
             core.setOutput('run_linux', linux.length > 0 ? 'true' : 'false');
             core.setOutput('run_macos', macos.length > 0 ? 'true' : 'false');
             core.setOutput('run_windows', windows.length > 0 ? 'true' : 'false');
+            core.setOutput('run_android', android.length > 0 ? 'true' : 'false');
+
+            // One `versionCode` for every Android ABI in this release, in the same YYYYMMDDHH (UTC)
+            // format as cargo-makepad's `version_code = "auto"`, which each job would compute on its own.
+            const now = new Date();
+            const pad2 = (n) => String(n).padStart(2, '0');
+            core.setOutput('android_version_code', `${now.getUTCFullYear()}${pad2(now.getUTCMonth() + 1)}`
+              + `${pad2(now.getUTCDate())}${pad2(now.getUTCHours())}`);
 
   create_release:
     name: Create Release
@@ -177,7 +202,7 @@ jobs:
             needs.determine_matrices.outputs.run_linux == 'true' ||
             needs.determine_matrices.outputs.run_macos == 'true' ||
             needs.determine_matrices.outputs.run_windows == 'true' ||
-            github.event.inputs.build_android_aarch64 == 'true' ||
+            needs.determine_matrices.outputs.run_android == 'true' ||
             github.event.inputs.build_ios == 'true'
           )
         )
@@ -555,19 +580,43 @@ jobs:
           uploadUpdaterJson: false
 
   for_android:
-    name: Release Robrix for Android (aarch64)
-    needs: [check_tag_version, create_release]
-    if: ${{ always() && ((github.event_name == 'push' && needs.check_tag_version.result == 'success') || (github.event_name == 'workflow_dispatch' && github.event.inputs.build_android_aarch64 == 'true')) }}
+    name: Release Robrix for Android (${{ matrix.abi }})
+    needs: [check_tag_version, determine_matrices, create_release]
+    if: ${{ always() && ((github.event_name == 'push' && needs.check_tag_version.result == 'success') || (github.event_name == 'workflow_dispatch' && needs.determine_matrices.outputs.run_android == 'true')) }}
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.determine_matrices.outputs.android_matrix) }}
     steps:
       - uses: actions/checkout@v5
 
       - name: Install Rust Stable
         uses: dtolnay/rust-toolchain@stable
 
+      ## Every ABI's APK in a release must share one versionCode, so a device can switch
+      ## between them. With `auto`, each job would compute its own from the current hour.
+      - name: Pin the Android version code
+        shell: bash
+        env:
+          VERSION_CODE: ${{ needs.determine_matrices.outputs.android_version_code }}
+        run: |
+          set -euo pipefail
+          if [[ ! "$VERSION_CODE" =~ ^[0-9]{10}$ ]]; then
+            echo "::error::Expected a YYYYMMDDHH version code, got '${VERSION_CODE}'."
+            exit 1
+          fi
+          sed -i "s/^version_code = \"auto\"$/version_code = ${VERSION_CODE}/" Cargo.toml
+          if ! grep -qx "version_code = ${VERSION_CODE}" Cargo.toml; then
+            echo "::error::Failed to set version_code = ${VERSION_CODE} in Cargo.toml."
+            exit 1
+          fi
+
       - name: Package (android)
         uses: project-robius/makepad-packaging-action@v1.8.0
         env:
+          ## The action builds (and names the asset after) this ABI alone. It ignores
+          ## the `--target` in `args`, so without this an armv7 job would build aarch64.
+          MAKEPAD_ANDROID_ABI: ${{ matrix.abi }}
           AWS_LC_SYS_CMAKE_BUILDER: 1
           MAKEPAD_ANDROID_FULL_NDK: true
           ## Fat LTO takes ~7 MB off the apk and ~35 MB off the installed size.
@@ -582,7 +631,7 @@ jobs:
             --config profile.dev.debug-assertions=false
         with:
           github_token: ${{ secrets.ROBRIX_RELEASE }}
-          args: --target aarch64-linux-android
+          args: --target ${{ matrix.target }}
           app_name: Robrix
           releaseId: ${{ needs.create_release.outputs.release_id }}
           ## Same as the action's default naming, minus the `-release` mode suffix.
diff --git a/Cargo.lock b/Cargo.lock
index 0348449f8..e0ab1053f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "accessory"
@@ -219,7 +219,7 @@ dependencies = [
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "arrayvec"
@@ -239,7 +239,7 @@ checksum = "9dbc3a507a82b17ba0d98f6ce8fd6954ea0c8152e98009d36a40d8dcc8ce078a"
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "libloading 0.8.9",
 ]
@@ -547,9 +547,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.14.1"
+version = "1.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d"
+checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13"
 dependencies = [
  "aws-lc-sys",
  "untrusted 0.7.1",
@@ -558,16 +558,15 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.32.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee74396bee4da70c2e27cf94762714c911725efe69d9e2672f998512a67a4ce4"
+checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc"
 dependencies = [
- "bindgen",
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
- "libloading 0.8.8",
+ "pkg-config 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -669,30 +668,10 @@ version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.13.2",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bit-vec",
 ]
@@ -700,12 +679,12 @@ dependencies = [
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "bitflags"
@@ -848,7 +827,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "bytemuck"
@@ -865,7 +844,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "bytes"
@@ -899,9 +878,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.38"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -915,15 +894,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -933,7 +903,7 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "cfg_aliases"
@@ -944,7 +914,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "chacha20"
@@ -1057,17 +1027,6 @@ dependencies = [
  "inout 0.2.2",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.8",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.48"
@@ -1317,7 +1276,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "crunchy"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "crypto-bigint"
@@ -1722,7 +1681,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "dunce"
@@ -1882,7 +1841,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 [[package]]
 name = "equivalent"
 version = "1.0.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "errno"
@@ -2019,9 +1978,9 @@ checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.2"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "flate2"
@@ -2065,7 +2024,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 [[package]]
 name = "foldhash"
 version = "0.2.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "foreign-types"
@@ -2221,7 +2180,7 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
 ]
@@ -2302,12 +2261,6 @@ dependencies = [
  "polyval",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
-
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
@@ -2429,7 +2382,7 @@ dependencies = [
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "foldhash 0.2.0 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
 ]
@@ -2482,7 +2435,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "hilog-sys"
@@ -2917,7 +2870,7 @@ dependencies = [
 [[package]]
 name = "indexmap"
 version = "2.13.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "equivalent 1.0.2 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
  "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
@@ -2977,15 +2930,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -3121,13 +3065,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "libloading"
 version = "0.8.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
  "windows-link 0.2.1",
@@ -3277,7 +3221,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -3285,12 +3229,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-code-language",
  "makepad-widgets",
@@ -3299,7 +3243,7 @@ dependencies = [
 [[package]]
 name = "makepad-code-language"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "pulldown-cmark 0.12.2",
 ]
@@ -3307,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3315,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -3324,7 +3268,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3350,7 +3294,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3358,12 +3302,12 @@ dependencies = [
 [[package]]
 name = "makepad-fast-inflate"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-git",
 ]
@@ -3371,17 +3315,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "weezl",
 ]
@@ -3389,7 +3333,7 @@ dependencies = [
 [[package]]
 name = "makepad-git"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-fast-inflate",
 ]
@@ -3397,7 +3341,7 @@ dependencies = [
 [[package]]
 name = "makepad-half"
 version = "2.7.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
  "crunchy 0.2.4 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
@@ -3408,7 +3352,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3422,7 +3366,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "ttf-parser",
 ]
@@ -3430,7 +3374,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3439,7 +3383,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3447,7 +3391,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3455,7 +3399,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3463,12 +3407,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3477,7 +3421,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3485,7 +3429,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3499,12 +3443,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "ash",
  "bitflags 2.10.0",
@@ -3542,7 +3486,7 @@ dependencies = [
 [[package]]
 name = "makepad-platform-video"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-apple-sys",
  "makepad-objc-sys",
@@ -3552,12 +3496,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3572,7 +3516,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3580,7 +3524,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3589,17 +3533,17 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-stitch"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
  "makepad-error-log",
@@ -3611,7 +3555,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3620,7 +3564,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3629,7 +3573,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3638,7 +3582,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3646,7 +3590,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3661,7 +3605,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-error-log",
  "makepad-zune-core",
@@ -3670,12 +3614,12 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "simd-adler32",
 ]
@@ -3683,7 +3627,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3691,7 +3635,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-fast-inflate",
  "makepad-zune-core",
@@ -3701,7 +3645,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -4083,7 +4027,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "memoffset"
@@ -4116,12 +4060,6 @@ dependencies = [
  "unicase 2.8.1",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -4155,7 +4093,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "27.0.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "arrayvec 0.7.6",
  "bit-set",
@@ -4253,16 +4191,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr 2.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.1"
@@ -4327,7 +4255,7 @@ dependencies = [
 [[package]]
 name = "num-traits"
 version = "0.2.20"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "num_cpus"
@@ -4491,7 +4419,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 [[package]]
 name = "once_cell"
 version = "1.21.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -4763,7 +4691,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "polling"
@@ -4848,16 +4776,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -4911,7 +4829,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
  "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
@@ -5363,12 +5281,12 @@ dependencies = [
 [[package]]
 name = "robius-common"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 
 [[package]]
 name = "robius-directories"
 version = "6.0.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "dirs-sys",
  "jni",
@@ -5378,7 +5296,7 @@ dependencies = [
 [[package]]
 name = "robius-file-picker"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "android-build",
  "block2",
@@ -5400,7 +5318,7 @@ dependencies = [
 [[package]]
 name = "robius-location"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "android-build",
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5416,7 +5334,7 @@ dependencies = [
 [[package]]
 name = "robius-open"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "block2",
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5433,7 +5351,7 @@ dependencies = [
 [[package]]
 name = "robius-share"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "android-build",
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5452,7 +5370,7 @@ dependencies = [
 [[package]]
 name = "robius-speech"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "jni",
  "robius-android-env",
@@ -5471,7 +5389,7 @@ dependencies = [
 [[package]]
 name = "robius-web-auth-session"
 version = "0.3.1"
-source = "git+https://github.com/project-robius/robius#aea7a4fc3d502dc04bbabf201398e11890443fda"
+source = "git+https://github.com/project-robius/robius#2e39df6e2b2842cb3ebfac9ddec89cb1eccd2413"
 dependencies = [
  "block2",
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5706,7 +5624,7 @@ dependencies = [
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "rustc-hash"
@@ -5831,7 +5749,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck 1.25.0",
@@ -5934,7 +5852,7 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "scopeguard"
@@ -5945,7 +5863,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "sealed"
@@ -6240,9 +6158,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signal-hook-registry"
@@ -6275,7 +6193,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "siphasher"
@@ -6301,7 +6219,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "socket2"
@@ -6325,7 +6243,7 @@ dependencies = [
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
 ]
@@ -6687,7 +6605,7 @@ dependencies = [
 [[package]]
 name = "thiserror"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "thiserror-impl 2.0.18",
 ]
@@ -6715,7 +6633,7 @@ dependencies = [
 [[package]]
 name = "thiserror-impl"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -7099,7 +7017,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "tungstenite"
@@ -7162,7 +7080,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-bidi"
@@ -7173,17 +7091,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-ident"
@@ -7194,12 +7112,12 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-ident"
 version = "1.0.22"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-normalization"
@@ -7219,17 +7137,17 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "unicode-segmentation"
@@ -7525,7 +7443,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "downcast-rs",
  "scoped-tls 1.0.1 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
@@ -7536,7 +7454,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -7546,7 +7464,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7555,7 +7473,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -7565,7 +7483,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "makepad-error-log",
  "pkg-config 0.3.32 (git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix)",
@@ -7616,7 +7534,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "whoami"
@@ -7679,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7698,7 +7616,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7731,7 +7649,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7752,7 +7670,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7816,7 +7734,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "windows-numerics"
@@ -7860,7 +7778,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7877,7 +7795,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -8271,7 +8189,7 @@ dependencies = [
 [[package]]
 name = "zerocopy"
 version = "0.8.39"
-source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#30453ac29f64f452000009d31796b03d28c4bc4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=dock_current_tab_robrix#b6588efca1e2a18bcc6100bce54107ed88549627"
 
 [[package]]
 name = "zerocopy-derive"
diff --git a/README.md b/README.md
index f5a3646e8..4583438d7 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 
 > [!TIP]
 > ▶️  [Click here to download & install Robrix](https://github.com/project-robius/robrix/releases/latest) on macOS, iOS, Android, Linux, and Windows.
+> On Android, most devices need the `android-aarch64` APK. Devices with a 32-bit ARM system (`armeabi-v7a`, e.g., those reporting `armv7l` or `armv8l`), which can't install that one, need the `android-armv7` APK.
 
 Robrix is a fast, powerful Matrix chat client written from scratch in Rust.
 
@@ -212,10 +213,11 @@ The following table shows which host systems can currently be used to build Robr
 
 1. Follow all steps in the previous section about desktop builds.
 
-2. Install the `cargo-makepad` build tool:
+2. Install the `cargo-makepad` build tool, from the same Makepad repository and branch that Robrix depends on (see `Cargo.toml`):
    ```sh
-   cargo install --force --git https://github.com/makepad/makepad.git --branch dev cargo-makepad
+   cargo install --force --git https://github.com/kevinaboos/makepad.git --branch dock_current_tab_robrix cargo-makepad
    ```
+   * Robrix's Android app uses a class that this cargo-makepad builds into the APK. An APK built with a cargo-makepad that doesn't have it, such as one from upstream Makepad's `dev` branch, crashes at launch.
 
 ### Android
 3. Use `cargo-makepad` to install the Android toolchain with the full NDK included:
@@ -228,7 +230,12 @@ The following table shows which host systems can currently be used to build Robr
    cargo makepad android run -p robrix --release
    ```
     * You'll need to connect a physical Android device with developer options enabled, or start up an emulator using Android Studio.
-        * API version 33 or higher is required, which is Android 13 and up.
+        * Android 8.0 (API version 26) or newer is required.
+    * The above builds for 64-bit ARM (`arm64-v8a`). To build for a device with a 32-bit ARM system (`armeabi-v7a`), pass `--abi=armv7` before the subcommand in both steps 3 and 4:
+      ```sh
+      cargo makepad android --abi=armv7 install-toolchain --full-ndk
+      cargo makepad android --abi=armv7 run -p robrix --release
+      ```
 
 
 ### iOS / iPadOS
diff --git a/resources/android/AndroidManifest.xml.template b/resources/android/AndroidManifest.xml.template
index d793ff211..09f252464 100644
--- a/resources/android/AndroidManifest.xml.template
+++ b/resources/android/AndroidManifest.xml.template
@@ -67,6 +67,21 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- Lets robius-share share files on Android 8 and 9, which have no MediaStore
+             Downloads collection to copy them into. It serves robius-share's copies in
+             the app's cache to apps that are granted access to them. The class comes with
+             cargo-makepad, so build with the cargo-makepad from the Makepad version that
+             Robrix depends on: without the class, the app crashes at launch. -->
+        <provider
+            android:name="dev.makepad.android.MakepadFileProvider"
+            android:authorities="{package_id}.robius.share"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="dev.makepad.android.MakepadFileProvider.cacheDirs"
+                android:value="robius-share" />
+        </provider>
     </application>
 
     <queries>
diff --git a/src/home/send_status_indicator.rs b/src/home/send_status_indicator.rs
index 0fe868964..afdf01a74 100644
--- a/src/home/send_status_indicator.rs
+++ b/src/home/send_status_indicator.rs
@@ -490,8 +490,10 @@ impl SendStatusIndicatorRef {
     }
 }
 
-fn upload_percent(current_bytes: usize, total_bytes: usize) -> u8 {
-    (current_bytes * 100).checked_div(total_bytes).unwrap_or(0).min(100) as u8
+/// Returns how much of an upload is done, from 0 to 100 percent.
+pub fn upload_percent(current_bytes: usize, total_bytes: usize) -> u8 {
+    // Widen first: `current_bytes * 100` overflows a 32-bit `usize` (e.g., armv7) above ~43 MB.
+    (current_bytes as u128 * 100).checked_div(total_bytes as u128).unwrap_or(0).min(100) as u8
 }
 
 /// Stringifies an upload's progress, e.g. "Uploading... 40% (2 MB / 5 MB)".
@@ -556,3 +558,16 @@ pub fn stringify_send_error(error: &matrix_sdk::Error) -> &'static str {
 const UNVERIFIED_DEVICES_TEXT: &str = "some recipients have unverified devices.";
 const IDENTITY_CHANGED_TEXT: &str = "someone's verified identity has changed.";
 const OWN_VERIFICATION_TEXT: &str = "this device isn't verified yet.";
+
+#[cfg(test)]
+mod tests {
+    use super::upload_percent;
+
+    #[test]
+    fn upload_percent_does_not_overflow() {
+        assert_eq!(upload_percent(45_000_000, 50_000_000), 90);
+        assert_eq!(upload_percent(usize::MAX / 2, usize::MAX), 49);
+        assert_eq!(upload_percent(usize::MAX, usize::MAX), 100);
+        assert_eq!(upload_percent(1, 0), 0);
+    }
+}
diff --git a/src/sliding_sync.rs b/src/sliding_sync.rs
index a167e2588..78c0836d0 100644
--- a/src/sliding_sync.rs
+++ b/src/sliding_sync.rs
@@ -37,7 +37,7 @@ use std::io;
 use hashbrown::{HashMap, HashSet};
 use crate::{
     app::AppStateAction, app_data_dir, cache_dir, avatar_cache::AvatarUpdate, event_preview::{BeforeText, TextPreview, text_preview_of_raw_timeline_event, text_preview_of_timeline_item}, home::{
-        add_room::KnockResultAction, invite_screen::{JoinRoomResultAction, LeaveRoomResultAction}, link_preview::LinkPreviewData, room_screen::{InviteResultAction, RoomLink, RoomLinkDestination, RoomLinkResolved, TimelineUpdate}, rooms_list::{self, InvitedRoomInfo, InviterInfo, JoinedRoomInfo, LatestEventPreview, RoomsListUpdate, enqueue_rooms_list_update}, rooms_list_header::RoomsListHeaderAction, send_status_indicator::stringify_send_error, timeline_items::index_of_event, tombstone_footer::SuccessorRoomDetails
+        add_room::KnockResultAction, invite_screen::{JoinRoomResultAction, LeaveRoomResultAction}, link_preview::LinkPreviewData, room_screen::{InviteResultAction, RoomLink, RoomLinkDestination, RoomLinkResolved, TimelineUpdate}, rooms_list::{self, InvitedRoomInfo, InviterInfo, JoinedRoomInfo, LatestEventPreview, RoomsListUpdate, enqueue_rooms_list_update}, rooms_list_header::RoomsListHeaderAction, send_status_indicator::{stringify_send_error, upload_percent}, timeline_items::index_of_event, tombstone_footer::SuccessorRoomDetails
     }, login::login_screen::LoginAction, logout::{logout_confirm_modal::LogoutAction, logout_state_machine::{LogoutConfig, is_logout_in_progress, logout_with_state_machine}}, media_cache::{MediaCacheEntry, MediaCacheEntryRef}, persistence::{self, ClientSessionPersisted, load_app_state}, profile::{
         user_profile::UserProfile,
         user_profile_cache::{UserProfileUpdate, enqueue_user_profile_update},
@@ -2790,7 +2790,7 @@ async fn matrix_worker_task(
                                 if related_to == txn_id =>
                             {
                                 let percent = (progress.total > 0)
-                                    .then(|| progress.current * 100 / progress.total);
+                                    .then(|| upload_percent(progress.current, progress.total));
                                 if last_percent == percent { continue }
                                 last_percent = percent;
                                 let _ = sender_clone.send(TimelineUpdate::FileUploadProgress {
@@ -6367,9 +6367,7 @@ async fn timeline_subscriber_handler(
                             && new_event.transaction_id() == Some(old_txn_id)
                             && let Some(EventSendState::NotSentYet { progress: Some(p) }) = new_event.send_state()
                         {
-                            let percent = (p.progress.current * 100)
-                                .checked_div(p.progress.total)
-                                .unwrap_or(0);
+                            let percent = upload_percent(p.progress.current, p.progress.total) as usize;
                             latest_progress_updates = Some((index, percent));
                             num_progress_updates += 1;
                         }