Merge "Omnibox supports search extra data"