Merge "Add APV codec support to Platform extractor" into main