Merge "Taskbar Divider Container" into main