Merge "Fix a couple of drag and drop issues from transient taskbar" into tm-qpr-dev