Merging from ub-launcher3-master @ build 6668015 am: 8a27ba85bc

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

Change-Id: I0a7d03b2258894b3690949a717c3b61e4c6026c1