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

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

Change-Id: I11e8a3851184059c70c30e26c49686b2f6e3fadf