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

* commit 'c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e':
  fix end of track presentation on suspended output