Merge "Fix the custom theme page shape bug" into ub-launcher3-master am: 77140557c6

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

Change-Id: Id1b9bd58158e199546f6705c3092845c95e5ca91