Merge "DevelopmentSettings: Clarify grouping of settings and purpose"