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

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

Change-Id: I9172e541e2f662ccadafe0d3bfa5ed76e0b165a8