am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"

* commit 'c82d63c2809dde3f2aa27412699da4aeaa9298d7':
  Replace Maps with UserDictionarySettings to trigger database writes