Cherry-pick PRs #6172 and #6203 to staging

[EdgeClaws]

Summary

Cherry-picks the merged changes from develop into staging:

• fix(maestro): repair recent existing test flows #6172 — 9b59394caeb290152a9a0fcb45c6977d504d9ee9
• Standardize wallet test ID separators #6203 — 1bd8d8d9a6daf24a28ea7bf10b3cc70bc06c20c8

Validation

• Both merge commits cherry-picked cleanly with first-parent mainline semantics.
• Each cherry-picked commit is patch-equivalent to its source merge commit.
• All changed Maestro YAML files parse successfully.
• git diff --check passes.
• Worktree is clean.

Testing

• Tested on iOS
• Tested on Android

Worked on by

• EdgeClaws

[JP0P]

No blocking correctness findings. Reviewed both backports and staging compatibility: each commit is patch-equivalent to its source merge (#6172 and #6203), and the resulting runtime source, native projects, dependencies, and Maestro flows match the merged develop version. Identifier producers and consumers agree; no old underscore wallet IDs remain.

Validation: all 27 changed flows passed Maestro check-syntax; git diff --check passed; CI lint, TypeScript, and Jest passed. This review did not rerun device E2E tests.

Nonblocking commit hygiene: the flattened cherry-picks inherit 68- and 77-character merge subjects. The repository convention says "max 50 chars" (AGENTS.md); suggested subjects are Backport Maestro fixes from #6172 and Backport test ID separators from #6203.

Review completed with dev agents review skill (minorly adapted for codex).