Merge "Consolidate Hero search result with SearchResultIconRow" into ub-launcher3-master