Merge "Fix CDM UI regressions" into main