Merge "Fix DnD logic for determining current drag screen / panel" into tm-dev...

Merge "Fix DnD logic for determining current drag screen / panel" into tm-dev am: 28890edf am: c63934c2

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

Change-Id: I501ae6a5d7241604c95dbae2e72f23c23be7175e