Merge "Measure WidgetsBottomPicker again when the number of spans changes" into sc-dev am: 6604eb54bf am: 55bdce183e

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

Change-Id: I7210577b677f1012509a52828e6c2366e25389a8