Merging from ub-launcher3-master @ build 6675739 am: 00927f9171

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

Change-Id: I7c90e69448ea622cb380731c1b96a7edc40cc042