ServicePicker, RemotePicker: moved duplicate code to CustomObjectPicker