Merge "Don't change the text in reaction to a user dict add" into klp-dev