Merge "Space out 3 button nav on taskbar" into tm-qpr-dev