Merge "Handle empty stsc box" into jb-mr1-dev