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

* commit 'ee9ea9c88cf297726b088f86dfc05869879c8e23':