Merge "allow secondary users to use notification settings" into oc-dev