Merge "Fixes to support transient taskbar in desktop mode" into tm-qpr-dev