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

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

Change-Id: I3b7abd0e1e20ccf963e9127625d4096106ece60f