Merge "System binds PAC Local Proxy instead of self start" into klp-dev