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

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

Change-Id: I48fa65e0f71a379189f194377c3504394ca36eb2