Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev