Merge "Update taskbar overflow button" into main