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