[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: 912206c17d -s ours
am skip reason: subject contains skip directive

Change-Id: I9c27523a9e934757c75cde5eda5e267bd9478b6c