Merge "Fixed a bug where restored promise icons stay promise icons." into ub-launcher3-qt-future-dev
am: 32a3421f1a

Change-Id: Ic8c429b151e4e679c7e38e0b33bc30f885dd4ba1