Merge "Create Subscribe to layer from publisher surfaces" into oc-mr1-dev