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

Change-Id: Iae226f9da2ff9f4ee63945c41d6f9ad1685d8286