Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev