Merge "Fix integer overflow during MP4 atom processing"