Merge "[CDM perm sync] Add user confirmation UI"