Merge "Fix wallpaper picker crash if folder is in hotseat" into sc-v2-dev am: 437e44810d am: 15c653c65c

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

Change-Id: Idcee3d0543efaad86a0dbd0409ed5f1596971369