Merge "overlay: Support for returning pipe based on capability"