Merge "Make some minor improvements to MediaFormat" into rvc-dev