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