BLD-364: Merge "video sources" and "download video" fields.
Address comments.