Merge "Add a synchronized lock into the SplitDependencyLoaderImpl" into sc-dev