Merge "Fix networktype on per process DNS setting"