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

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

Change-Id: I6ce59685d842277cf857fd50e09cf443e625eeea