Merge "Update flows for notification history" into rvc-dev