Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev