Merge "Consolidate notification settings." into oc-dev