Merge "ResourceSet: store isFromDependency in incremental state" into studio-2.0-release