Merge "Only callback with sync error if sync was a service request"