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

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

Change-Id: I1132bb78e77ff4bb4020b9d4b7b4c145fcdc004c