Merge change 8228 into donut

* changes:
  Remove background padding workaround from SuggestionsAdapter