Merge "Notification: Respect disabled HUNs on updates" into nyc-dev