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