Merge "Use transient taskbar size/margin to calculate taskbar position for persistent taskbar" into tm-qpr-dev