Merge "Add flag for APV Software Codec" into main