Merge "Clean up DataSettingsManager calls"