Merge "Fix a crash when starting a service in the isolated split" into sc-dev