Merge "Fix a11y issues in the schedule editor" into main