Merge commit 'b1ef743df3a436e04f61386151b962d210c6c2ac' * commit 'b1ef743df3a436e04f61386151b962d210c6c2ac': Use icon URI as icon cache key in search dialog
Merge commit 'b1ef743df3a436e04f61386151b962d210c6c2ac' * commit 'b1ef743df3a436e04f61386151b962d210c6c2ac': Use icon URI as icon cache key in search dialog