Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev