Merge "Fixing taskbar window not collapsed after closing folder" into sc-v2-dev