Merge "[CDM] Fix a UI clip issue" into main