Merge "Fix grid layout problem after going back from split select" into sc-v2-dev am: 226bd5b973 am: c28e01c0a6

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

Change-Id: I2ca737b2d37e0c0de26e6e60f689f621af0dc485