Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd7 am: 985e5db8

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

Change-Id: I5d2f1a6a678439b8e6666e464fe7bf232bc58f10