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