Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev