Merge "Support highlighting the menu entry for search results"