Merge "Fix some issues with taskbar" into sc-dev am: e263a44567

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79662375a2446ad0312198e83912880c6a06792d