Merge "Revert "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox"" into main