Merge "Fix an issue with unbinding in ObservableServiceConnection." into main