Merge "Fix crash after adding a word to the user dictionary." into honeycomb