Merge "ExternalMedia: Change return object from ExternalMedia to Channel"