Merge "Taskbar app icon drag interruption fix." into main