Merge "Make Setting UI use system proxy validity check"