Conflicts (all keep-both): tools/browser_tool.py takes main's scope-bound passthrough + loopback NO_PROXY and still routes the env through the Bot Desktop's desktop_env; i18n gains main's sudoDesc/sudoCommandUnavailable beside our sudoInstallDesc; test_profiles keeps both sides' new tests.