Merging from ub-launcher3-master @ build 6665145 am: 01adf9b8a5

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

Change-Id: I95de8196ff8c50fcb993c16c9abe3bcb9e992296