Merge "Fix crash when launching some apps which require icons to be loaded on the model thread" into ub-launcher3-qt-dev am: d3dcb497bd
am: 4066862990

Change-Id: I372e239b35b4128d82016ba8b1ebeaa6460141a0