Merge "Prefer software codec with debug property"