Merge "Tweaking the logging in the fail case, adding additional cases for where the db icon cache should be updated. (5205131)"