Merge "Introduce #shouldShowAddToDictionaryHint" into lmp-dev