Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev