Merge "Add IDs to buttons in 3 button nav for Taskbar" into sc-v2-dev