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

* commit 'bbe199985b2f3ef932111c0d679d4f1e308879bf':