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

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

Change-Id: Ibc3b3979c98c2c7f92e32a58ab00495e4ee4e40d