Merge "CodecCapabilities: use optional instead of 0 to represent null in supports()." into main