Merge change 7688 into donut

* changes:
  Copy cached drawables in search dialog.