Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad am: 4a11331092

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

Change-Id: I442742dd7c15b7bc07e997688207d150fc960916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>