Merge "Change NotificationListener initialization"