Merge "Update VPN capabilities when its underlying network set is null." into pi-dev