Merge "Update Taskbar edu with new font style" into main