Merge "Update for stashed taskbar animation" into tm-qpr-dev