Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 am: a9397251d5

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

Change-Id: I691254d108008b99ee1a6a2bc00ee963270cff8a