Merge "Remove Dependency.get(InitController.class)"