Merge "[Perm Sync] Remove old feature flag" into main