If I press Esc while using search, clear the search bar first

If I've typed something into the search bar, a quick press of Esc should clear the search bar but not exit search. If I press Esc with the search bar clear, then exit search.
This makes it easy to both clear the search bar (press Esc once) and exit search (press it once or twice depending on the state).