Merge "Fix number of channels in inline notification settings" into oc-dev