Merge "Catch double unbind of dead service"