Merge "Add multiuser support for notification history"