Merge "Add more tests to NotificationMsgDelegate" into rvc-dev