Merge "[FUI04] Refactor VpnInfo"