Merge "Use framework VPN icon in VpnDialogs package"