Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev