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

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

Change-Id: Iff73f67b7cfc755edd30ffe538c7e4a02695c98a