Merge "App & channel notification settings updates" into oc-dev