Merge "Catch double unbind of dead service" into pi-dev