media_profiles: Merge with upstream version of Serrano