Merge "Fix DnD logic for determining current drag screen / panel" into tm-dev