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

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

Change-Id: I4a768643dcb6f024058c8ff501aa771cad3a80e9