Merge change 629 into donut

* changes:
  Display the app icon to the left of the search field for search within apps.