Merge "Moving PluginManager to dagger" into main