Merge "Notification settings update." into oc-dr1-dev