Merge "Make UserHistoryDictionary use updateEntriesForWordWithNgramContext()"