Merging from ub-launcher3-master @ build 6586492 am: 616b7223d9 am: 921366922e

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

Change-Id: I42cc228f76e88815bf1f1fd55ccd4e577b0ece90