Merge "Fix a bug where the PAC proxy port is not set correctly."