Merge "Minor fixes to new gallery parsing" into ub-launcher3-master am: f411795ca7 am: b6a0d68e84

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

Change-Id: I03a354bb06b3a19b59f4f56518814a89735f9899