Merge "Fix the Settings crash when resetting network" into tm-dev