Merge change 26148 into eclair

* changes:
  Use icon URI as icon cache key in search dialog