am 5380aa29: Merge change 7512 into donut

Merge commit '5380aa29470274de5b3e445d577ef0834cfacb71'

* commit '5380aa29470274de5b3e445d577ef0834cfacb71':
  Get rid of drawing hacks for search dialog suggestions