Merge "Clean up DataSettingsManager calls" into tm-dev