Merge "Fixing taskbar window not collapsed after closing folder" into sc-v2-dev am: 8235469f43

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

Change-Id: I56adafb7848d8836bace5c2f42ee4d5a77de5aa2