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

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

Change-Id: I0c5213ea4f29bafd7f9b951c5f974630364d616c