Fix enabled/disable overlapping video/audio with DCP content (part of #1355)