Merge "[Settings] Correct some typo" into sc-dev