Merge "Fix some taskbar stashing issues" into sc-v2-dev am: ff705eabe6

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

Change-Id: I049ff420aad926df7b1a3fd78510ae26e616ebdc