Merge "Revert "Fix missing workspace icons when changing wallpaper in SUW"" into ub-launcher3-master am: eb17ab67b6 am: 6e66ea35a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/11882469

Change-Id: I95c6f3d1f81b5e104e23c20a8ebe1b7f318a7669