Merge "Create Vpn ManageDialog in onCreate, not onResume"