Merge "Annotate the typed word with its source dictionary"