Merge "Refine style picker layout (2/2)" into ub-launcher3-master am: d22dbe586d

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

Change-Id: I000c775abf1a8ba73185108c33f97c5ca3ed9b08