Merge "Rename addSuppressor to addLegacySuppressor" into main