Merge "Update taskbar overflow view to match the spec" into main