diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
index 0d0e1c95107a..8d213c2c2d9a 100644
--- a/apps/.i18n/native-source.json
+++ b/apps/.i18n/native-source.json
@@ -11,7 +11,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 99,
+      "line": 101,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Searching…",
       "surface": "android",
@@ -19,7 +19,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 184,
+      "line": 186,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Mic off",
       "surface": "android",
@@ -27,7 +27,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 194,
+      "line": 196,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Off",
       "surface": "android",
@@ -835,7 +835,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 336,
+      "line": 329,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Last gateway error",
       "surface": "android",
@@ -843,7 +843,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 336,
+      "line": 329,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Pairing required",
       "surface": "android",
@@ -851,7 +851,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 347,
+      "line": 340,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "OpenClaw Android ${openClawAndroidVersionLabel()}",
       "surface": "android",
@@ -859,7 +859,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 388,
+      "line": 381,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Setup code, endpoint, TLS, token, password, onboarding.",
       "surface": "android",
@@ -867,7 +867,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 392,
+      "line": 385,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Collapse advanced controls",
       "surface": "android",
@@ -875,7 +875,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 392,
+      "line": 385,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Expand advanced controls",
       "surface": "android",
@@ -883,7 +883,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 423,
+      "line": 416,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Run these on the gateway host:",
       "surface": "android",
@@ -891,7 +891,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 426,
+      "line": 419,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "For Tailscale or public hosts, use wss:// or Tailscale Serve. Private LAN ws:// remains supported.",
       "surface": "android",
@@ -899,7 +899,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 455,
+      "line": 448,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Android Emulator",
       "surface": "android",
@@ -907,7 +907,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 464,
+      "line": 457,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Localhost",
       "surface": "android",
@@ -915,7 +915,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 491,
+      "line": 484,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Port",
       "surface": "android",
@@ -923,7 +923,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 491,
+      "line": 484,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Port (optional, defaults to 443)",
       "surface": "android",
@@ -931,7 +931,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 517,
+      "line": 510,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Turn this on for Tailscale or public hosts. Private LAN ws:// remains supported.",
       "surface": "android",
@@ -939,15 +939,15 @@
     },
     {
       "kind": "ui-call",
-      "line": 543,
+      "line": 536,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
-      "source": "token",
+      "source": "Leave blank to keep saved token",
       "surface": "android",
-      "id": "native.android.60da1ba96bf1ed31"
+      "id": "native.android.d56dcd9606f37263"
     },
     {
       "kind": "ui-call",
-      "line": 552,
+      "line": 545,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt",
       "source": "Password (optional)",
       "surface": "android",
@@ -1083,7 +1083,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 232,
+      "line": 290,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "Setup code points to an insecure remote gateway. $remoteGatewaySecurityRule $remoteGatewaySecurityFix",
       "surface": "android",
@@ -1091,7 +1091,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 234,
+      "line": 292,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "QR code points to an insecure remote gateway. $remoteGatewaySecurityRule $remoteGatewaySecurityFix",
       "surface": "android",
@@ -1099,7 +1099,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 236,
+      "line": 294,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "$remoteGatewaySecurityRule $remoteGatewaySecurityFix",
       "surface": "android",
@@ -1107,7 +1107,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 241,
+      "line": 299,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "Setup code has invalid gateway URL.",
       "surface": "android",
@@ -1115,7 +1115,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 242,
+      "line": 300,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "QR code did not contain a valid setup code.",
       "surface": "android",
@@ -1123,7 +1123,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 243,
+      "line": 301,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt",
       "source": "Enter a valid manual endpoint to connect.",
       "surface": "android",
@@ -1369,14 +1369,6 @@
       "surface": "android",
       "id": "native.android.c8ce503b95d13058"
     },
-    {
-      "kind": "ui-named-argument",
-      "line": 102,
-      "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/NodesDevicesSettingsScreen.kt",
-      "source": "Device pairing admin needs elevated access. Connected nodes still work.",
-      "surface": "android",
-      "id": "native.android.3df83311891719d9"
-    },
     {
       "kind": "ui-named-argument",
       "line": 106,
@@ -1475,7 +1467,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 433,
+      "line": 428,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "OPENCLAW",
       "surface": "android",
@@ -1483,7 +1475,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 438,
+      "line": 433,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Your personal AI assistant.\nExfoliate! Exfoliate!",
       "surface": "android",
@@ -1491,7 +1483,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 448,
+      "line": 443,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Connect Gateway",
       "surface": "android",
@@ -1499,7 +1491,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 592,
+      "line": 587,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Setup code issue",
       "surface": "android",
@@ -1507,7 +1499,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 609,
+      "line": 604,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Advanced",
       "surface": "android",
@@ -1515,7 +1507,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 618,
+      "line": 613,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Setup code",
       "surface": "android",
@@ -1523,7 +1515,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 620,
+      "line": 615,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Host",
       "surface": "android",
@@ -1531,7 +1523,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 621,
+      "line": 616,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Port",
       "surface": "android",
@@ -1539,7 +1531,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 624,
+      "line": 619,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "TLS off",
       "surface": "android",
@@ -1547,7 +1539,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 624,
+      "line": 619,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "TLS on",
       "surface": "android",
@@ -1555,7 +1547,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 625,
+      "line": 620,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Local",
       "surface": "android",
@@ -1563,7 +1555,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 627,
+      "line": 622,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Token optional",
       "surface": "android",
@@ -1571,7 +1563,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 628,
+      "line": 623,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Password optional",
       "surface": "android",
@@ -1579,7 +1571,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 633,
+      "line": 628,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Pair with Gateway",
       "surface": "android",
@@ -1587,7 +1579,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 702,
+      "line": 697,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Last gateway",
       "surface": "android",
@@ -1595,7 +1587,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 744,
+      "line": 739,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Retry connection",
       "surface": "android",
@@ -1603,7 +1595,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 749,
+      "line": 744,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Edit connection",
       "surface": "android",
@@ -1611,7 +1603,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 750,
+      "line": 745,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Copy diagnostic",
       "surface": "android",
@@ -1619,7 +1611,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 784,
+      "line": 779,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Copy approval command",
       "surface": "android",
@@ -1627,7 +1619,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 811,
+      "line": 806,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Allow permissions",
       "surface": "android",
@@ -1635,7 +1627,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 816,
+      "line": 811,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "These permissions keep OpenClaw secure\nand useful.",
       "surface": "android",
@@ -1643,7 +1635,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 894,
+      "line": 889,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Open $title",
       "surface": "android",
@@ -1651,7 +1643,7 @@
     },
     {
       "kind": "ui-call",
-      "line": 955,
+      "line": 950,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Choose what this phone can share with OpenClaw. You can change these later in Settings.",
       "surface": "android",
@@ -1659,7 +1651,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 976,
+      "line": 971,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Back",
       "surface": "android",
@@ -1667,7 +1659,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 980,
+      "line": 975,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Permission Setup",
       "surface": "android",
@@ -1675,7 +1667,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1035,
+      "line": 1030,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Granted",
       "surface": "android",
@@ -1683,7 +1675,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1035,
+      "line": 1030,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Not granted",
       "surface": "android",
@@ -1691,7 +1683,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1060,
+      "line": 1055,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Continue",
       "surface": "android",
@@ -1699,7 +1691,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1241,
+      "line": 1239,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Setup code expired. Scan a fresh setup QR.",
       "surface": "android",
@@ -1707,7 +1699,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1245,
+      "line": 1243,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway password is required. Enter it again or edit this connection.",
       "surface": "android",
@@ -1715,7 +1707,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1246,
+      "line": 1244,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway password is invalid. Re-enter it or reset this gateway connection.",
       "surface": "android",
@@ -1723,7 +1715,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1247,
+      "line": 1245,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway token is required. Enter it again or edit this connection.",
       "surface": "android",
@@ -1731,7 +1723,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1249,
+      "line": 1247,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway requires this device identity. Re-authenticate or reset this gateway connection.",
       "surface": "android",
@@ -1739,7 +1731,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1253,
+      "line": 1251,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Saved authentication is invalid. Re-authenticate or reset this gateway connection.",
       "surface": "android",
@@ -1747,7 +1739,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1254,
+      "line": 1252,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway authentication is not configured. Edit this connection and try again.",
       "surface": "android",
@@ -1755,7 +1747,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1255,
+      "line": 1253,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Gateway authentication needs review. Check gateway settings, then retry.",
       "surface": "android",
@@ -1763,7 +1755,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1272,
+      "line": 1270,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "$summary $it",
       "surface": "android",
@@ -1771,7 +1763,7 @@
     },
     {
       "kind": "ui-toast",
-      "line": 1310,
+      "line": 1308,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Approval command copied",
       "surface": "android",
@@ -1779,7 +1771,7 @@
     },
     {
       "kind": "ui-toast",
-      "line": 1336,
+      "line": 1334,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt",
       "source": "Diagnostic copied",
       "surface": "android",
@@ -2091,7 +2083,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 188,
+      "line": 190,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Usage",
       "surface": "android",
@@ -2099,7 +2091,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 208,
+      "line": 210,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connect the gateway to load usage.",
       "surface": "android",
@@ -2107,7 +2099,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 213,
+      "line": 215,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No usage data yet.",
       "surface": "android",
@@ -2115,7 +2107,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 214,
+      "line": 216,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Provider limits will appear here when your gateway reports them.",
       "surface": "android",
@@ -2123,7 +2115,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 239,
+      "line": 241,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Cron Jobs",
       "surface": "android",
@@ -2131,7 +2123,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 243,
+      "line": 245,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Enabled",
       "surface": "android",
@@ -2139,7 +2131,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 250,
+      "line": 252,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Android shows scheduled work status. Create and edit schedules from the desktop app.",
       "surface": "android",
@@ -2147,7 +2139,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 260,
+      "line": 262,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connect the gateway to load cron jobs.",
       "surface": "android",
@@ -2155,7 +2147,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 265,
+      "line": 267,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No scheduled jobs.",
       "surface": "android",
@@ -2163,7 +2155,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 266,
+      "line": 268,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Create recurring OpenClaw work from the desktop app.",
       "surface": "android",
@@ -2171,7 +2163,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 289,
+      "line": 291,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Agents",
       "surface": "android",
@@ -2179,7 +2171,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 300,
+      "line": 302,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connect the gateway to load agents.",
       "surface": "android",
@@ -2187,7 +2179,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 304,
+      "line": 306,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No agents loaded yet.",
       "surface": "android",
@@ -2195,7 +2187,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 330,
+      "line": 332,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Approvals",
       "surface": "android",
@@ -2203,7 +2195,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 341,
+      "line": 343,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Refresh",
       "surface": "android",
@@ -2211,7 +2203,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 341,
+      "line": 343,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Refreshing",
       "surface": "android",
@@ -2219,7 +2211,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 354,
+      "line": 356,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Gateway disconnected.",
       "surface": "android",
@@ -2227,7 +2219,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 355,
+      "line": 357,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connect the gateway to load approval requests in the app.",
       "surface": "android",
@@ -2235,7 +2227,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 361,
+      "line": 363,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No gateway approvals.",
       "surface": "android",
@@ -2243,7 +2235,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 362,
+      "line": 364,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Exec approval requests will appear here while this phone is connected.",
       "surface": "android",
@@ -2251,7 +2243,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 369,
+      "line": 371,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Session activity",
       "surface": "android",
@@ -2259,7 +2251,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 370,
+      "line": 372,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Chat tool calls waiting in the active session remain visible here.",
       "surface": "android",
@@ -2267,7 +2259,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 384,
+      "line": 386,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Profile",
       "surface": "android",
@@ -2275,7 +2267,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 387,
+      "line": 389,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Device name",
       "surface": "android",
@@ -2283,7 +2275,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 388,
+      "line": 390,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Save Profile",
       "surface": "android",
@@ -2291,7 +2283,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 403,
+      "line": 405,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Talk Provider Setup",
       "surface": "android",
@@ -2299,7 +2291,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 408,
+      "line": 410,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Audio Test",
       "surface": "android",
@@ -2307,7 +2299,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 409,
+      "line": 411,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Check that OpenClaw can speak clearly on this phone.",
       "surface": "android",
@@ -2315,7 +2307,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 412,
+      "line": 414,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Enable speaker",
       "surface": "android",
@@ -2323,7 +2315,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 412,
+      "line": 414,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Mute speaker",
       "surface": "android",
@@ -2331,7 +2323,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 413,
+      "line": 415,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Assistant speech muted",
       "surface": "android",
@@ -2339,7 +2331,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 413,
+      "line": 415,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Replies play aloud",
       "surface": "android",
@@ -2347,7 +2339,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 415,
+      "line": 417,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Muted",
       "surface": "android",
@@ -2355,7 +2347,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 415,
+      "line": 417,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "On",
       "surface": "android",
@@ -2363,7 +2355,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 419,
+      "line": 421,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Done",
       "surface": "android",
@@ -2371,7 +2363,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 430,
+      "line": 432,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Realtime Provider",
       "surface": "android",
@@ -2379,7 +2371,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 433,
+      "line": 435,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Live",
       "surface": "android",
@@ -2387,7 +2379,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 437,
+      "line": 439,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Voice",
       "surface": "android",
@@ -2395,7 +2387,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 444,
+      "line": 446,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Transport",
       "surface": "android",
@@ -2403,7 +2395,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 562,
+      "line": 564,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Allowlist",
       "surface": "android",
@@ -2411,7 +2403,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 562,
+      "line": 564,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Blocklist",
       "surface": "android",
@@ -2419,7 +2411,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 595,
+      "line": 597,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Notifications",
       "surface": "android",
@@ -2427,7 +2419,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 599,
+      "line": 601,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Alerts stay on this phone.",
       "surface": "android",
@@ -2435,7 +2427,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 599,
+      "line": 601,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "OpenClaw can receive selected alerts.",
       "surface": "android",
@@ -2443,7 +2435,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 611,
+      "line": 613,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Granted",
       "surface": "android",
@@ -2451,7 +2443,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 611,
+      "line": 613,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Setup",
       "surface": "android",
@@ -2459,7 +2451,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 616,
+      "line": 618,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Check Access",
       "surface": "android",
@@ -2467,7 +2459,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 616,
+      "line": 618,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Open System Access",
       "surface": "android",
@@ -2475,7 +2467,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 626,
+      "line": 628,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Forwarding Mode",
       "surface": "android",
@@ -2483,7 +2475,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 675,
+      "line": 677,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "App Filter",
       "surface": "android",
@@ -2491,7 +2483,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 682,
+      "line": 684,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Close App Picker",
       "surface": "android",
@@ -2499,7 +2491,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 682,
+      "line": 684,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Open App Picker",
       "surface": "android",
@@ -2507,7 +2499,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 687,
+      "line": 689,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Search apps",
       "surface": "android",
@@ -2515,7 +2507,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 690,
+      "line": 692,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Show System Apps",
       "surface": "android",
@@ -2523,7 +2515,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 698,
+      "line": 700,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No matching apps.",
       "surface": "android",
@@ -2531,7 +2523,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 709,
+      "line": 711,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Showing ${visibleApps.size} of ${apps.size}. Refine search for more.",
       "surface": "android",
@@ -2539,7 +2531,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 844,
+      "line": 846,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Phone Capabilities",
       "surface": "android",
@@ -2547,7 +2539,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 853,
+      "line": 855,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Allow photo library access.",
       "surface": "android",
@@ -2555,7 +2547,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 853,
+      "line": 855,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Selected or full photo access granted.",
       "surface": "android",
@@ -2563,7 +2555,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 863,
+      "line": 865,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "App list stays on this phone.",
       "surface": "android",
@@ -2571,7 +2563,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 863,
+      "line": 865,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "OpenClaw can list launcher-visible apps.",
       "surface": "android",
@@ -2579,7 +2571,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 874,
+      "line": 876,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Location",
       "surface": "android",
@@ -2587,15 +2579,39 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 877,
+      "line": 879,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "While Using",
       "surface": "android",
       "id": "native.android.53928793ec65d766"
     },
+    {
+      "kind": "ui-call",
+      "line": 918,
+      "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
+      "source": "Replace gateway setup?",
+      "surface": "android",
+      "id": "native.android.f3d5fd047bfdb023"
+    },
+    {
+      "kind": "ui-call",
+      "line": 933,
+      "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
+      "source": "Replace setup",
+      "surface": "android",
+      "id": "native.android.869c8be127ce5282"
+    },
+    {
+      "kind": "ui-call",
+      "line": 938,
+      "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
+      "source": "Cancel",
+      "surface": "android",
+      "id": "native.android.c6c8e0c4b8a9a7cf"
+    },
     {
       "kind": "conditional-branch",
-      "line": 913,
+      "line": 949,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connected",
       "surface": "android",
@@ -2603,7 +2619,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 913,
+      "line": 949,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Offline",
       "surface": "android",
@@ -2611,7 +2627,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 914,
+      "line": 950,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Not paired",
       "surface": "android",
@@ -2619,7 +2635,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 914,
+      "line": 950,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Online",
       "surface": "android",
@@ -2627,7 +2643,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 924,
+      "line": 960,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Reconnect",
       "surface": "android",
@@ -2635,7 +2651,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 925,
+      "line": 961,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Disconnect",
       "surface": "android",
@@ -2643,7 +2659,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 930,
+      "line": 966,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Clear this phone's saved gateway access and scan a fresh setup code.",
       "surface": "android",
@@ -2651,7 +2667,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 932,
+      "line": 968,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Pair New Gateway",
       "surface": "android",
@@ -2659,7 +2675,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 933,
+      "line": 969,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Setup Code",
       "surface": "android",
@@ -2667,7 +2683,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 937,
+      "line": 973,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Android can scan or paste an existing setup code, but this gateway does not expose setup-code generation to the app yet. Generate the QR/code on the gateway host with openclaw qr, then scan it here or paste the setup code below.",
       "surface": "android",
@@ -2675,7 +2691,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 946,
+      "line": 982,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Connection Setup",
       "surface": "android",
@@ -2683,7 +2699,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 947,
+      "line": 983,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Setup code",
       "surface": "android",
@@ -2691,7 +2707,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 949,
+      "line": 985,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Host",
       "surface": "android",
@@ -2699,7 +2715,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 950,
+      "line": 986,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Port",
       "surface": "android",
@@ -2707,7 +2723,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 954,
+      "line": 990,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Local",
       "surface": "android",
@@ -2715,7 +2731,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 958,
+      "line": 994,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Token",
       "surface": "android",
@@ -2723,7 +2739,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 959,
+      "line": 995,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Bootstrap",
       "surface": "android",
@@ -2731,7 +2747,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 961,
+      "line": 997,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Password",
       "surface": "android",
@@ -2739,7 +2755,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 966,
+      "line": 1002,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Save & Connect",
       "surface": "android",
@@ -2747,7 +2763,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1022,
+      "line": 1042,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Appearance",
       "surface": "android",
@@ -2755,7 +2771,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1033,
+      "line": 1053,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Theme",
       "surface": "android",
@@ -2763,7 +2779,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1056,
+      "line": 1076,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Ready",
       "surface": "android",
@@ -2771,7 +2787,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1085,
+      "line": 1105,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "About",
       "surface": "android",
@@ -2779,7 +2795,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1097,
+      "line": 1117,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Gateway",
       "surface": "android",
@@ -2787,7 +2803,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1099,
+      "line": 1119,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Runtime",
       "surface": "android",
@@ -2795,7 +2811,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1102,
+      "line": 1122,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Update",
       "surface": "android",
@@ -2803,7 +2819,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1137,
+      "line": 1161,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Check",
       "surface": "android",
@@ -2811,7 +2827,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 1169,
+      "line": 1193,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Back",
       "surface": "android",
@@ -2819,7 +2835,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1234,
+      "line": 1258,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Sending",
       "surface": "android",
@@ -2827,7 +2843,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1243,
+      "line": 1267,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Allow Once",
       "surface": "android",
@@ -2835,7 +2851,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1243,
+      "line": 1267,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Allowing",
       "surface": "android",
@@ -2843,7 +2859,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1251,
+      "line": 1275,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Always",
       "surface": "android",
@@ -2851,7 +2867,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1251,
+      "line": 1275,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Saving",
       "surface": "android",
@@ -2859,7 +2875,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1259,
+      "line": 1283,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Deny",
       "surface": "android",
@@ -2867,7 +2883,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1259,
+      "line": 1283,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Denying",
       "surface": "android",
@@ -2875,7 +2891,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1284,
+      "line": 1308,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Review",
       "surface": "android",
@@ -2883,7 +2899,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1309,
+      "line": 1333,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Issue",
       "surface": "android",
@@ -2891,7 +2907,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1340,
+      "line": 1364,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Default assistant",
       "surface": "android",
@@ -2899,7 +2915,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1342,
+      "line": 1366,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Default",
       "surface": "android",
@@ -2907,7 +2923,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1398,
+      "line": 1422,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Needs attention",
       "surface": "android",
@@ -2915,7 +2931,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1401,
+      "line": 1425,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Waiting ${minutes}m",
       "surface": "android",
@@ -2923,7 +2939,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1401,
+      "line": 1425,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Waiting for review",
       "surface": "android",
@@ -2931,7 +2947,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1429,
+      "line": 1453,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "${job.scheduleLabel} · ${formatCronWake(job.nextRunAtMs)} · ${job.promptPreview}",
       "surface": "android",
@@ -2939,7 +2955,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1436,
+      "line": 1460,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "No limits reported",
       "surface": "android",
@@ -2947,7 +2963,7 @@
     },
     {
       "kind": "conditional-branch",
-      "line": 1457,
+      "line": 1481,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/ui/SettingsScreens.kt",
       "source": "Off",
       "surface": "android",
diff --git a/apps/.i18n/native/zh-TW.json b/apps/.i18n/native/zh-TW.json
index d97d6f03c090..64234343198a 100644
--- a/apps/.i18n/native/zh-TW.json
+++ b/apps/.i18n/native/zh-TW.json
@@ -589,9 +589,9 @@
       "translated": "若使用 Tailscale 或公開主機，請開啟此選項。私人 LAN ws:// 仍受支援。"
     },
     {
-      "id": "native.android.60da1ba96bf1ed31",
-      "source": "token",
-      "translated": "token"
+      "id": "native.android.d56dcd9606f37263",
+      "source": "Leave blank to keep saved token",
+      "translated": "留空以保留已儲存的權杖"
     },
     {
       "id": "native.android.8123f2cfbe415437",
@@ -858,11 +858,6 @@
       "source": "Linked phones and node hosts will appear here after pairing.",
       "translated": "配對後，已連結的手機和節點主機會顯示在這裡。"
     },
-    {
-      "id": "native.android.3df83311891719d9",
-      "source": "Device pairing admin needs elevated access. Connected nodes still work.",
-      "translated": "裝置配對管理員需要提高權限。已連線的節點仍可運作。"
-    },
     {
       "id": "native.android.70b6f8fccd67f4ce",
       "source": "Pending Requests",
@@ -1623,6 +1618,21 @@
       "source": "While Using",
       "translated": "使用期間"
     },
+    {
+      "id": "native.android.f3d5fd047bfdb023",
+      "source": "Replace gateway setup?",
+      "translated": "要取代 Gateway 設定嗎？"
+    },
+    {
+      "id": "native.android.869c8be127ce5282",
+      "source": "Replace setup",
+      "translated": "取代設定"
+    },
+    {
+      "id": "native.android.c6c8e0c4b8a9a7cf",
+      "source": "Cancel",
+      "translated": "取消"
+    },
     {
       "id": "native.android.718cb50d1bff3e32",
       "source": "Connected",