Drag and Drop: Rework drop target highlight. (#4281, #3272)

Amend 4ddb6b46, 4b94738c7
3 files changed