Merge "Enable support for  main type cap aware demux management"