Merge "Support multiple Vpn ManageDialogs"