Merge "NetworkNotificationManager: correctly handle existing notifications"