Merge "Fix two dragging related bugs in Launcher home" into sc-v2-dev am: 81a3e6e7e7 am: 520fb5dc08

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

Change-Id: I62623134ea2cc38d64f51b737db236ab09470373