Merge "Fix track estimation for presentation complete" into jb-mr1-dev