Merge "Handle null media metadata" into rvc-qpr-dev