Merge "App & channel notification settings updates" into oc-dev am: 8e305ee536
am: afebbacc12

Change-Id: I2273c52047bce301f6f5fca906fa1d52428a4929