Merge "Taskbar fixes when apps move to desktop and back" into tm-qpr-dev