Merge "[Settings] Correct spelling in source code"