Merge "Listen for SyncAdapter death to cancel a sync"