Merge "Taskbar in overview" into tm-qpr-dev