Merge "[CDM] Perm Sync toggle fixes" into main