Merge "CEC: Remove listener records only if they are currently used" into nyc-dev