Merge "Updating Routing and subscription state to support subscription to layer from specific publisher"