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