Merge "Remove custom PluginHandler from PluginInstanceManager" into sc-v2-dev