Merge "Remove notification settings for deleted users" into oc-dev