Merge "Prevent thumbnails from shifting if placeholder view doesn't overlap" into sc-dev am: 3f349db912

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

Change-Id: I5ccb5eee47c89f5038e51cb839d8daddfe3e0aa0