Merge "[CDM] Support Perm Sync toggle setting" into udc-qpr-dev