Merge "Prevent users from blocking system notifications." into nyc-dev