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

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

Change-Id: I8771871953115ebbfcb2eba9654e18ad5eaaf954