Merge "Avoid crash for stss sync sample number 0"