PR from GCI staging_done branch

Had to do some conflict resolution as well. :|
Not the ideal variant for T() (difficult to parse and extract) - better to separate the fallback.

Also inconsistent - it's "cr_shelter_notification_subject", but not "event_event_notification_subject". Should either both be prefixed, or neither.