Merge branch 'system-notes-legacy' into 'master'

Fix alignment of legacy system notes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166051



Merged-by: Paul Gascou-Vaillancourt <pgascouvaillancourt@gitlab.com>
Approved-by: Paul Gascou-Vaillancourt <pgascouvaillancourt@gitlab.com>
Reviewed-by: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Co-authored-by: Annabel Dunstone Gray <annabel.dunstone@gmail.com>