Merge "Re-enable throw when notifications posted can't find channel" into oc-dev