Merge "Revert "Add a way to stash/unstash transient taskbar."" into tm-qpr-dev