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

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

Change-Id: I79ceac16028890f411f7cd4748032332e066fe5f