Merge "Fix number of channels in inline notification settings" into oc-dev am: 1ab1da3f25
am: 04f57e2d50

Change-Id: Icdd4c0c75cda5c290f035ea52ff175b9e2c9e6e7