am 7b0982d8: am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop

* commit '7b0982d819b2baf5e4061f5d64a6b7b3da459e7f':
  Null check in flushInvalidIcons