Merge "Do not retain module through NotificationListener"