Merge "Fix wallpaper picker page TB issue" into ub-launcher3-master am: 0da32e6751 am: 7ff0634543

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

Change-Id: I5cbdd7b06dee6e9e506e7d346f2297c243b35ae3