Fit shared videos to viewer, just like images. Issue #1648
Consolidate two sections, per code review. Issue #1648
Merge pull request #7211 from mattcaron/master

Fit shared videos to viewer, just like images. Issue #1648