Merge "Enable 3 button nav for taskbar" into sc-v2-dev