Merge "Make framework-media stubs use the new defaults" into rvc-dev