Merge "Improve notification history"