Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev