Merge "VpnSettings: fix bugs."