fix(patch): cherry-pick 87a0db2 to release/v0.25.0-pr-17308 [CONFLICTS]#17316

skeshive merged 2 commits into

release/v0.25.0-pr-17308google-gemini/gemini-cli:release/v0.25.0-pr-17308from

hotfix/v0.25.0/0.25.1/stable/cherry-pick-87a0db2/pr-17308google-gemini/gemini-cli:hotfix/v0.25.0/0.25.1/stable/cherry-pick-87a0db2/pr-17308Copy head branch name to clipboard