Merge "Guard against NPE inside BaseIconFactory Bug: 137253043" into ub-launcher3-qt-r1-dev
am: b1b4562a46

Change-Id: If97029ff59cc426db1dd4a7d433a5ab264eabeba