Merge "Revert^2 "Set setCurrentProxyScriptUrl as public""