Merge "[CD Taskbar] Fix TaskbarDividerView Crash" into main