Merge "Omnibox improvements"