Merge "[CEC Configuration] Fix missing listeners" into sc-dev