[[ Bug 12821 ]] Implement markers for AV player, tweaks to markers in QT player.
Merge branch 'bugfix-12821' into develop