Merge "Add a settings for notification history"