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

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



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