Merge branch 'rs-list-styling' into 'master'

Improve styling for mixed list styles

Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921

See merge request !2026