Make _combine_annotations also merge extras#14084

larsoner merged 3 commits into

mne-tools:mainmne-tools/mne-python:mainfrom

wmvanvliet:fix-combine-annotationswmvanvliet/mne-python:fix-combine-annotationsCopy head branch name to clipboard