Merge "Fix omnibox ordering"