Merge "Replace Maps with UserDictionarySettings to trigger database writes" into jb-dev