Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev