Merge "Notification history updates" into rvc-dev