Make stock VideoContent easier to extend by subclassing.
Merge branch 'next' into tabbed_options