Merge "Updates to notification history proto"