Merge "Disable drag from taskbar while in desktop." into main