Merge "Improve performance for NotificationMgr UT cases"