Merge "[CDM] Fix removeOnTransportsChangedListener API" into main