Merge "Don't clear Global Proxy on boot." into klp-dev