Merge "Do no redact emergency notifications" into main