Merge "Redact smart replies and actions from untrusted listeners" into main