fix(core): merge user settings with extension-provided MCP servers#22484

abhipatel12 merged 4 commits intomaingoogle-gemini/gemini-cli:mainfrom

abhi/fix-mcp-exclude-toolsgoogle-gemini/gemini-cli:abhi/fix-mcp-exclude-toolsCopy head branch name to clipboard