Merge "Move NavButtons to end of taskbar" into sc-v2-dev