Merge "Fix testNotificationReportedFlake" into rvc-dev