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

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

Change-Id: I101c31cc8f4e20e49ade15fc9bad4e76daabdc54