Merge "Fixing folder drawLeaveBehind() with Taskbar Pinning enabled" into main