Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev