Bring back the clear icon for clearing the search

Caused by a class rename

Change-Id: If4fa0bc14ca890e43182993f8bdd5ddb9de62417