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

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

Change-Id: Ib3030f94d0fc2285fec808043033a863f8735f62