[[ Bug 13267 ]] Ensure current time matches end time when reaching end of selection.
Merge branch 'bugfix-13267' into develop