Merge "Fix handling of ID3v2.4 extended header" into rvc-dev