Merge "fix end of track presentation on suspended output" into jb-mr1-dev