Draft: Fixes duplicate users in search suggestions
This is simply an integration branch of !145818 (merged) and !136330 (merged).
Not meant to be merged.
Edited by Miguel Rincon
This is simply an integration branch of !145818 (merged) and !136330 (merged).
Not meant to be merged.