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

Change-Id: Ie4eb7ae96307ac8e746f2b24b3e7a926526e1be5