Merge "Rename framework-media-sources"