Merge "Fix taskbar folder leave-behind not being drawn" into sc-v2-dev