Merge "Allow overriding of service start behavior" into main