Merge pull request #8000 from stenzek/more-videocommon-cleanup Additional cleanup/fixes from VideoCommon merge
