Merge "Refactor setCurrentProxyScriptUrl to a void method"