Merge "Spell checker settings updates" into nyc-dev