Merge "Fix wrong split layout after drag drop" into tm-qpr-dev