Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev