Merge "Fixes for notification history" into rvc-dev