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

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

Change-Id: I6ffa38883ea10bd95835344ea96ed929366aeb1d