Merge "Fix some bugs in widget pickers." into sc-dev am: b42513fbc5 am: f65051d63c

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

Change-Id: Ic951369f322d197367f3667186ddf7b43d40d4b3