Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev

        public FusionDictionary getFinalDictionary() {

            final FusionDictionary dict = mDictionary;

            for (final String shortcutOnly : mShortcutsMap.keySet()) {

                if (dict.hasWord(shortcutOnly)) continue;

                dict.add(shortcutOnly, 0, mShortcutsMap.get(shortcutOnly));

            }

            mDictionary = null;

            mShortcutsMap.clear();

            mWord = "";