Merge "resourceloader: Instantiate main class via ServiceWiring"