Merge pull request #12886 from AdmiralCurtiss/dual-core-lockup Core/VideoCommon: Revert change from #12828
