Merge "Fix Tapl drag to folder issue on S5 and R3" into tm-dev am: 6166bbff

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

Change-Id: I794578808183380f3a2978ed9102d024eca9588f