Merge "Enable capability based demux management"