Merge "Pre-O apps can see Default Channel name." into oc-dev