Merge "Cancel current operation when binder dies"