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: I2ac60a5b52ffb48fe5dfa02a84e624676882206e