Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837

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



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