Merging from ub-launcher3-master @ build 6609171 am: e496c66cd0

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

Change-Id: I10faee93d3d8099facddbad1299434235b1668ae