Merge "Fix typos in DefaultSettings"