Merge "Final cleanup: Add missing fields in SectionSettings and DemuxCaps"