Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 am: 4035b79b1d

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

Change-Id: I527097ba19414c3ed99606f95276ff506cfb4ec2