Merge "[CDM] Add Permissions Sync toggle" into main