Merge "Bringing up APV SW codec" into main