[automerger skipped] Merge "[DO NOT MERGE] Fixed a bug where restored promise icons stay promise icons." into ub-launcher3-qt-qpr1-dev
am: 32c8664fb4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id460f46bbbe82cfe2754219812d3681b56654864