Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev