Merge "Fix demux client closing typo" into sc-dev