Merge "Updating db icon cache when item id cache gets updated. (5205131)"