Companion PR for ' Simplify a few chain components creation APIs related to the service' (#1384)

* Switch branch

* Fix service creation

* Revert "Switch branch"

This reverts commit a7063358.

* Switch branch again

* Revert "Switch branch again"

This reverts commit 04afc509.

* Update substrate branch