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