Merge "Clean Opus headers after parse failure"