Merging from ub-launcher3-master @ build 6632592 am: a2cee8c9e6 am: cbf0b782af

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

Change-Id: Iaa694a80541e92ed10b5661efaf63cb03a7c6821