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: I6cda7a58c69141d53419a7bc97baac8d92c772c0