Merge "Revert^2 "Change CoreStartable @Dependencies to Injected Map"" into main