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

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

Change-Id: I1fd63c02091b062aac7d4978bbd3635d12e4db30