Merging from ub-launcher3-master @ build 6655765 am: 32af43ae80

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

Change-Id: I58f964e9d380481ec91b00d4d50aa35450f59545