Merge "(bug 17808) (bug 21167) use real links for search suggestions"