Merge "Add a missing null pointer check in the codec config comparison logic" into pi-dev