Merge "Polish CDM permission sync UI"