Merge "Update Settings UI for IKEv2/IPsec VPNs"