Merge "Allow setting a connection callback to PersistentServiceManager." into main