Merge "Some notification history fixes" into rvc-dev