Merge "Using resource overrides for PluginManager instead of code-swap" into main