am ddd7c497: am f758fd3a: am 6f613d29: Fix bugs 2218563 and 2176751 - Not properly loading icons, and sometimes marking them as cached when they\'re not.

Merge commit 'ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f'

* commit 'ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f':
  Fix bugs 2218563 and 2176751 - Not properly loading icons, and sometimes marking them as cached when