Merge "Enable support for capability based demux management"