Merge "Move class SearchEngineDummy to own file"