Merge change 7512 into donut

* changes:
  Get rid of drawing hacks for search dialog suggestions