Merge "Fix flaky NotificationMgrTests"