Merge "Simplify removeNotificationClient"