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

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

Change-Id: I6da222deeeac85b192303c3dcc7e184040deded0