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