Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev