Avoid NPE if icon assignment failed for whatever reason.

Change-Id: Iba4188d6b42179008154b8cbcbb14c36a22669de
merge changes from CyanogenMod 10.2 into local branch