Merge "Revert "Fix missing workspace icons when changing wallpaper in SUW"" into ub-launcher3-master