am 0e230c57: Merge change 7688 into donut

Merge commit '0e230c574bdbf096994f6b658a19c19585907f11'

* commit '0e230c574bdbf096994f6b658a19c19585907f11':
  Copy cached drawables in search dialog.