Merge "Fix bug with Taskbar second-app-selection animation" into tm-qpr-dev