Merging from ub-launcher3-master @ build 6552470 am: 1598484f96 am: 4679a8384e

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

Change-Id: I7feb8bf73a65b523a47e91581adc6edd58c81eb3