Merge "Do not redact system notifications" into main