Merge "pjsip: Fix a few media bugs with reinvites and asymmetric payloads."