Merge "Remove scheduled unbind if service died"