Refactored method name
Added TODO

notificationEventHolderList could be null at this point
Better device list restore