Merge "Add screen for notification history"