Merge "Revert "Support people search results"" into sc-dev