Merge "Add option to reset network settings to factory"