Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev