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: I7e3d0d325ef73f3bd006dd6d007913f20e222b91