Merge "Sanitize more of the notification text fields" into rvc-dev