Merge "Notification settings update." into oc-dev