Merge "[Settings] Stop network mode query when changing config" into tm-dev