Merge "Avoid crash for stss sync sample number 0" into lmp-dev