Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev am: 3d1bb164

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



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