Merge "Add null check in setSidebandStream" into oc-dev