Merge "Notification settings can contain dashboard settings" into oc-dev