Merge "Reorganize taskbar controllers" into sc-v2-dev