Merge "Refactor SearchAlgorithm and SearchCallback interface to work on generic search result type." into sc-dev